brahms: drop jessie-proposed buildd updates (as it does not exist yet)

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 55e6958cdb6f7486892cc6f2ccce836e8d14ec3a..52317ddf1cb0395c319dbfc6a152885619910ace 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -32,8 +32,10 @@ class buildd ($ensure=present) {
        }
 
        $suite = $::lsbdistcodename ? {
-               squeeze => $::lsbdistcodename,
-               wheezy  => $::lsbdistcodename,
+               squeeze  => $::lsbdistcodename,
+               wheezy   => $::lsbdistcodename,
+               jessie   => $::lsbdistcodename,
+               stretch  => $::lsbdistcodename,
                undef   => 'squeeze',
                default => 'wheezy'
        }
@@ -47,7 +49,7 @@ class buildd ($ensure=present) {
        }
 
        $buildd_prop_ensure = $::hostname ? {
-               /^(alkman|brahms|porpora|zandonai)$/ => 'present',
+               /^(alkman|porpora|zandonai)$/ => 'present',
                default => 'absent',
        }
 
@@ -142,7 +144,7 @@ class buildd ($ensure=present) {
                group   => buildd,
                owner   => buildd,
        }
-       file { '/home/buildd/status':
+       file { '/home/buildd/stats':
                ensure  => directory,
                mode    => '2755',
                group   => buildd,
@@ -162,6 +164,22 @@ class buildd ($ensure=present) {
        }
        file { '/home/buildd/.forward':
                content  => "|/usr/bin/buildd-mail\n",
+               group   => buildd,
+               owner   => buildd,
+       }
+
+       if ! $::buildd_key {
+               exec { 'create-buildd-key':
+                       command => '/bin/su - buildd -c \'mkdir -p -m 02700 .ssh && ssh-keygen -C "`whoami`@`hostname` (`date +%Y-%m-%d`)" -P "" -f .ssh/id_rsa -q\'',
+                       onlyif  => '/usr/bin/getent passwd buildd > /dev/null && ! [ -e /home/buildd/.ssh/id_rsa ]'
+               }
        }
 
+
+       if $::buildd_user_exists {
+               exec { 'add-buildd-user-to-sbuild':
+                       command => 'adduser buildd sbuild',
+                       onlyif  => "getent group sbuild > /dev/null && ! getent group sbuild | grep '\\<buildd\\>' > /dev/null"
+               }
+       }
 }