X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=8d0b2c0e96052c53606869d483739934856e4cc9;hb=963cd75a0593d779ff19090aab82ec22fbb6f971;hp=2ddf0663e779d29035051dacc8f3040bd7bd0185;hpb=6c647a0d2c8dc3f9e5c4e70863aae8e3011038ea;p=dsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 2ddf0663..8d0b2c0e 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -24,7 +24,7 @@ class buildd ($ensure=present) {
 			require => Package['dupload'],
 		}
 		site::linux_module { 'dm_snapshot': }
-		ferm::module { 'nf_conntrack_ftp': }
+		include ferm::ftp_conntrack
 	}
 
 	site::aptrepo { 'buildd':
@@ -46,28 +46,19 @@ class buildd ($ensure=present) {
 		require    => Package['apt-transport-https'],
 	}
 
+	$buildd_prop_ensure = $::hostname ? {
+		/^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
+		default => 'absent',
+	}
+
 	site::aptrepo { 'buildd.debian.org-proposed':
-		ensure     => $::hostname ? {
-		                             /^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
-		                             default => 'absent',
-		                            },
+		ensure     => $buildd_prop_ensure,
 		url        => 'https://buildd.debian.org/apt/',
 		suite      => "${suite}-proposed",
 		components => 'main',
 		require    => Package['apt-transport-https'],
 	}
 
-	#site::aptrepo { 'buildd.debian.org-experimental':
-	#	ensure     => $::hostname ? {
-	#	                             /^(xxxx)$/ => 'present',
-	#	                             default => 'absent',
-	#	                            },
-	#	url        => 'https://buildd.debian.org/apt/',
-	#	suite      => "${suite}-experimental",
-	#	components => 'main',
-	#	require    => Package['apt-transport-https'],
-	#}
-
 	# 'bad' extension
 	file { '/etc/apt/preferences.d/buildd.debian.org':
 		ensure => absent,