log rsync for syncproxy and security to dedicated logs

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

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 5c6a301..b58bd01 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -23,6 +23,13 @@ class buildd ($ensure=present) {
                        source  => 'puppet:///modules/buildd/dupload.conf',
                        require => Package['dupload'],
                }
+               package { 'buildd':
+                       ensure => installed,
+               }
+               file { '/etc/buildd/buildd.conf':
+                       source  => 'puppet:///modules/buildd/buildd.conf',
+                       require => Package['buildd'],
+               }
                site::linux_module { 'dm_snapshot': }
                include ferm::ftp_conntrack
        }
@@ -54,7 +61,7 @@ class buildd ($ensure=present) {
        }
 
        $buildd_prop_ensure = $::hostname ? {
-               /^(alkman|zandonai)$/ => 'present',
+               /^(alkman)$/ => 'present',
                default => 'absent',
        }
 
@@ -115,7 +122,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",
                }
        }