X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Finit.pp;h=7eccfad7c420295afa6b478fb1c97af7fe2623c6;hb=cf32084c267371671793a8ba8716d8393a71a55e;hp=2ddf0663e779d29035051dacc8f3040bd7bd0185;hpb=99ea046a8d65d34eff7373ca245f7133a02af9f4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 2ddf0663e..7eccfad7c 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,24 @@ class buildd ($ensure=present) {
 		require    => Package['apt-transport-https'],
 	}
 
+	$buildd_prop_ensure = $::hostname ? {
+		/^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
+		default => 'absent',
+	}
+
+	file { '/etc/apt/apt.conf.d/puppet-https-buildd':
+		content => "Acquire::https::buildd.debian.org::CaInfo \"/etc/ssl/certs/buildd.debian.org.crt\";\n",
+		#require => File['/etc/ssl/certs/buildd.debian.org.crt']
+	}
 	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'],
+		require    => [ Package['apt-transport-https'],
+		                File['/etc/apt/apt.conf.d/puppet-https-buildd'] ],
 	}
 
-	#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,