no more experimental_apache (previously cgi-grnet-01, pejacevic, petrova)

[mirror/dsa-puppet.git] / modules / debian_org / manifests / apt.pp

diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index 9fc02a0..3fc0979 100644 (file)
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -3,7 +3,7 @@
 # Stuff common to all debian.org servers
 #
 class debian_org::apt {
-       if $::lsbmajdistrelease <= '7' {
+       if versioncmp($::lsbmajdistrelease, '7') <= 0 {
                $mungedcodename = $::lsbdistcodename
        } elsif ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
                $mungedcodename = "${::lsbdistcodename}-kfreebsd"
@@ -11,7 +11,7 @@ class debian_org::apt {
                $mungedcodename = $::lsbdistcodename
        }
 
-       if $::lsbmajdistrelease <= '8' {
+       if versioncmp($::lsbmajdistrelease, '8') <= 0 {
                $fallbackmirror = 'http://cdn-fastly.deb.debian.org/debian/'
        } else {
                $fallbackmirror = 'http://deb.debian.org/debian/'
@@ -28,17 +28,20 @@ class debian_org::apt {
                suite      => [ $mungedcodename, "${::lsbdistcodename}-backports", "${::lsbdistcodename}-updates" ],
                components => ['main','contrib','non-free']
        }
-       site::aptrepo { 'security':
-               url        => [ 'http://security-cdn.debian.org/', 'http://security.anycast-test.mirrors.debian.org/debian-security/', 'http://security.debian.org/' ],
-               suite      => "${mungedcodename}/updates",
-               components => ['main','contrib','non-free']
-       }
 
-       if has_role('experimental_apache') {
-               $dbdosuites = [ 'debian-all', $::lsbdistcodename, 'jessie-apache2' ]
+       if ($::hostname in [smetana]) {
+               site::aptrepo { 'security':
+                       ensure => absent,
+               }
        } else {
-               $dbdosuites = [ 'debian-all', $::lsbdistcodename ]
+               site::aptrepo { 'security':
+                       url        => [ 'http://security-cdn.debian.org/', 'http://security.anycast-test.mirrors.debian.org/debian-security/', 'http://security.debian.org/' ],
+                       suite      => "${mungedcodename}/updates",
+                       components => ['main','contrib','non-free']
+               }
        }
+
+       $dbdosuites = [ 'debian-all', $::lsbdistcodename ]
        site::aptrepo { 'db.debian.org':
                url        => 'http://db.debian.org/debian-admin',
                suite      => $dbdosuites,