Add a comment

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 780e1bd..5cf7fb2 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -31,16 +31,9 @@ class buildd ($ensure=present) {
                                source  => 'puppet:///modules/buildd/buildd.conf',
                                require => Package['buildd'],
                        }
-                       if ($::lsbmajdistrelease >= 8) {
-                               file { '/etc/sbuild/sbuild.conf':
-                                       source  => 'puppet:///modules/buildd/sbuild.conf',
-                                       require => Package['sbuild'],
-                               }
-                       } else {
-                               file { '/etc/sbuild/sbuild.conf':
-                                       source  => 'puppet:///modules/buildd/sbuild.conf.wheezy',
-                                       require => Package['sbuild'],
-                               }
+                       file { '/etc/sbuild/sbuild.conf':
+                               source  => 'puppet:///modules/buildd/sbuild.conf',
+                               require => Package['sbuild'],
                        }
                        include ferm::ftp_conntrack
                }
@@ -57,29 +50,24 @@ class buildd ($ensure=present) {
                        default => 'jessie'
                }
 
-               $buildd_apt_url = $::debarchitecture ? {
-                       /^sparc$/ => 'http://buildd.debian.org/apt/',
-                       default   => 'https://buildd.debian.org/apt/',
-               }
-
-               site::aptrepo { 'buildd.debian.org':
-                       key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
-                       url        => $buildd_apt_url,
-                       suite      => $suite,
-                       components => 'main',
-                       require    => Package['apt-transport-https'],
-               }
-
-               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",
+               if (versioncmp($::lsbmajdistrelease, '9') >= 0) {
+                       site::aptrepo { 'buildd.debian.org':
+                               ensure => absent,
                        }
                } 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':
+                               key        => 'puppet:///modules/buildd/buildd.debian.org.gpg',
+                               url        => 'https://apt.buildd.debian.org/',
+                               suite      => $suite,
+                               components => 'main',
+                               require    => Package['apt-transport-https'],
                        }
                }
 
+               file { '/etc/apt/apt.conf.d/puppet-https-buildd':
+                       content => "Acquire::https::apt.buildd.debian.org::CaInfo \"/etc/ssl/ca-debian/ca-certificates.crt\";\n",
+               }
+
                # 'bad' extension
                file { '/etc/apt/preferences.d/buildd.debian.org':
                        ensure => absent,
@@ -96,16 +84,9 @@ class buildd ($ensure=present) {
                        package { 'python-psutil':
                                ensure => installed,
                        }
-                       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',
-                               }
+                       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':
@@ -117,9 +98,14 @@ class buildd ($ensure=present) {
                        content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
                }
 
+               service { 'buildd':
+                       enable => false,
+                       ensure => 'stopped',
+               }
+
                if $has_srv_buildd {
                        file { '/etc/cron.d/puppet-update-buildd-schroots':
-                               content  => "13 21 * * 0,3 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots buildd\n",
+                               content  => "13 22 * * 0,3 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots buildd\n",
                        }
                }