Improve ftp.debian-ports.org redirections

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 8fa6c23..4703bc8 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -23,7 +23,24 @@ class buildd ($ensure=present) {
                        source  => 'puppet:///modules/buildd/dupload.conf',
                        require => Package['dupload'],
                }
-               site::linux_module { 'dm_snapshot': }
+               package { 'buildd':
+                       ensure => installed,
+               }
+               file { '/etc/buildd/buildd.conf':
+                       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'],
+                       }
+               }
                include ferm::ftp_conntrack
        }
 
@@ -32,24 +49,28 @@ class buildd ($ensure=present) {
        }
 
        $suite = $::lsbdistcodename ? {
-               squeeze  => $::lsbdistcodename,
                wheezy   => $::lsbdistcodename,
                jessie   => $::lsbdistcodename,
                stretch  => $::lsbdistcodename,
-               undef   => 'squeeze',
-               default => 'wheezy'
+               undef   => 'wheezy',
+               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        => 'https://buildd.debian.org/apt/',
+               url        => $buildd_apt_url,
                suite      => $suite,
                components => 'main',
                require    => Package['apt-transport-https'],
        }
 
        $buildd_prop_ensure = $::hostname ? {
-               /^(alkman|brahms|porpora|zandonai)$/ => 'present',
+               /^(alkman)$/ => 'present',
                default => 'absent',
        }
 
@@ -83,7 +104,7 @@ class buildd ($ensure=present) {
                require => Package['debian.org']
        }
 
-       if ($::lsbmajdistrelease >= 7 and $::kernel == 'Linux') {
+       if ($::kernel == 'Linux') {
                package { 'python-psutil':
                        ensure => installed,
                }
@@ -110,7 +131,7 @@ class buildd ($ensure=present) {
 
        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",
+                       content  => "13 21 * * 0,3 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots buildd\n",
                }
        }
 
@@ -167,6 +188,17 @@ class buildd ($ensure=present) {
                group   => buildd,
                owner   => buildd,
        }
+       file { '/home/buildd/.gnupg':
+               ensure  => directory,
+               mode    => '700',
+               group   => buildd,
+               owner   => buildd,
+       }
+       file { '/home/buildd/.gnupg/gpg.conf':
+               content  => "personal-digest-preferences SHA512\n",
+               group   => buildd,
+               owner   => buildd,
+       }
 
        if ! $::buildd_key {
                exec { 'create-buildd-key':