Update ssl path

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 2dff5ec56b9699cb3af27e75b66e5650711214b0..220c9a8b5d0d349eb021b419f5e7e38740883930 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':
@@ -39,33 +39,29 @@ class buildd ($ensure=present) {
        }
 
        site::aptrepo { 'buildd.debian.org':
-               key        => 'puppet:///modules/buildd/buildd.debian.org.asc',
+               key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
                url        => 'https://buildd.debian.org/apt/',
                suite      => $suite,
                components => 'main',
                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/servicecerts/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