retire smetana

diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml
index f078bde..f8210ef 100644 (file)
--- a/modules/debian_org/files/misc/local.yaml
+++ b/modules/debian_org/files/misc/local.yaml
@@ -83,7 +83,6 @@ nameinfo:
   senfter.debian.org: Johanna Senfter (November, 27th, 1879 - August 11th, 1961)
   setoguchi.debian.org: 瀬戸口藤吉, Tokichi Setoguchi (June 28th, 1868 - November 8th, 1941)
   sibelius.debian.org: Jean Sibelius (December 8th, 1865 - September 20th, 1957)
-  smetana.debian.org: Bedřich Smetana (March 2nd, 1824 - May 12th, 1884)
   sonntag.debian.org: Brunhilde Sonntag (September 27th, 1936 - December 18th, 2002)
   sor.debian.org: Fernando Sor (February 14th, 1778 - July 10th, 1839)
   soriano.debian.org: Francesco Soriano (1548 or 1549 - July 19th, 1621)
@@ -138,7 +137,6 @@ host_settings:
     - harris.debian.org
     - minkus.debian.org
     - plummer.debian.org
-    - smetana.debian.org
     - zelenka.debian.org
     # buildd
     - antheil.debian.org

diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index 703cafc..32a1fa8 100644 (file)
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -21,11 +21,7 @@ class debian_org::apt {
                components => ['main','contrib','non-free']
        }
 
-       if ($::hostname in [smetana]) {
-               site::aptrepo { 'security':
-                       ensure => absent,
-               }
-       } elsif versioncmp($::lsbmajdistrelease, '8') <= 0 {
+       if versioncmp($::lsbmajdistrelease, '8') <= 0 {
                site::aptrepo { 'security':
                        url        => [ 'http://security-cdn.debian.org/', 'http://security.debian.org/' ],
                        suite      => "${::lsbdistcodename}/updates",