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 8d0b2c0e96052c53606869d483739934856e4cc9..220c9a8b5d0d349eb021b419f5e7e38740883930 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -39,7 +39,7 @@ 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',
@@ -51,12 +51,17 @@ class buildd ($ensure=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}-proposed",
                components => 'main',
-               require    => Package['apt-transport-https'],
+               require    => [ Package['apt-transport-https'],
+                               File['/etc/apt/apt.conf.d/puppet-https-buildd'] ],
        }
 
        # 'bad' extension