X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Fmanifests%2Fapt.pp;h=48b617e6e059bd5a5b8d22eeef09dbf439e713c5;hb=eff350d9b61530f97a839cbbb30ab498699aa097;hp=9fc02a0b2a22b7a3ae637b00eae84ae131a852f5;hpb=249b713a08d35bffb1cd52739be6f5808baa5a5f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index 9fc02a0b2..48b617e6e 100644
--- 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,10 +28,17 @@ 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 ($::hostname in [smetana]) {
+		site::aptrepo { 'security':
+			ensure => absent,
+		}
+	} else {
+		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') {