Make buildd-schroot-aptitude-kill work on jessie

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 8d0b2c0..289edf2 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,16 +47,26 @@ class buildd ($ensure=present) {
        }
 
        $buildd_prop_ensure = $::hostname ? {
-               /^(alkman|barber|brahms|porpora|zandonai)$/ => 'present',
+               /^(alkman|brahms|porpora|zandonai)$/ => 'present',
                default => 'absent',
        }
 
+       if ($::lsbmajdistrelease >= 8) {
+               file { '/etc/apt/apt.conf.d/puppet-https-buildd':
+                       content => "Acquire::https::buildd.debian.org::CaInfo \"/etc/ssl/ca-debian/ca-certificates.crt\";\n",
+               }
+       } else {
+               file { '/etc/apt/apt.conf.d/puppet-https-buildd':
+                       content => "Acquire::https::buildd.debian.org::CaInfo \"/etc/ssl/servicecerts/buildd.debian.org.crt\";\n",
+               }
+       }
        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
@@ -75,9 +85,16 @@ class buildd ($ensure=present) {
                package { 'python-psutil':
                        ensure => installed,
                }
-               file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
-                       source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill',
-                       mode    => '0555',
+               if ($::lsbmajdistrelease >= 8) {
+                       file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
+                               source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill',
+                               mode    => '0555',
+                       }
+               } else {
+                       file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
+                               source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill.wheezy',
+                               mode    => '0555',
+                       }
                }
        } else {
                file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
@@ -88,4 +105,11 @@ class buildd ($ensure=present) {
        file { '/etc/cron.d/puppet-buildd-aptitude':
                content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
        }
+
+
+       if $has_srv_buildd {
+               file { '/etc/cron.d/puppet-update-buildd-schroots':
+                       content  => "13 21 * * 0 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots buildd\n",
+               }
+       }
 }