Tell bad apt where to find its certificate

[dsa-puppet.git] / modules / buildd / manifests / init.pp

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index e0a5ad838201be4f9fdd3f8ee2da546840183581..7eccfad7c420295afa6b478fb1c97af7fe2623c6 100644 (file)
--- 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,26 +46,22 @@ class buildd ($ensure=present) {
                require    => Package['apt-transport-https'],
        }
 
-       site::aptrepo { 'buildd.debian.org-proposed':
-               ensure     => $::hostname ? {
-                                            /^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
-                                            default => 'absent',
-                                           },
-               url        => 'https://buildd.debian.org/apt/',
-               suite      => "${suite}-proposed",
-               components => 'main',
-               require    => Package['apt-transport-https'],
+       $buildd_prop_ensure = $::hostname ? {
+               /^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
+               default => 'absent',
        }
 
-       site::aptrepo { 'buildd.debian.org-experimental':
-               ensure     => $::hostname ? {
-                                            /^(krenek)$/ => '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     => $buildd_prop_ensure,
                url        => 'https://buildd.debian.org/apt/',
-               suite      => "${suite}-experimental",
+               suite      => "${suite}-proposed",
                components => 'main',
-               require    => Package['apt-transport-https'],
+               require    => [ Package['apt-transport-https'],
+                               File['/etc/apt/apt.conf.d/puppet-https-buildd'] ],
        }
 
        # 'bad' extension
@@ -73,8 +69,7 @@ class buildd ($ensure=present) {
                ensure => absent,
        }
        file { '/etc/apt/preferences.d/buildd':
-               content => template('buildd/etc/apt/preferences.d/buildd'),
-               before  => Site::Aptrepo['buildd.debian.org']
+               ensure => absent,
        }
        file { '/etc/cron.d/dsa-buildd':
                source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',