Add new lindsay volumes

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 7eccfad..de1affe 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',
@@ -47,12 +47,12 @@ class buildd ($ensure=present) {
        }
 
        $buildd_prop_ensure = $::hostname ? {
-               /^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
+               /^(alkman|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",
+               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':