#
# buildd/pybuildd configuration
#
- if $::hostname in [x86-bm-01,x86-grnet-01,zani] {
+ if $::hostname in [x86-bm-01,x86-grnet-01,x86-grnet-02,zani] {
#
# pybuildd configuration
#
mode => '755',
}
file { '/etc/systemd/journald.conf.d/persistency.conf':
- source => 'puppet:///modules/systemd/persistency.conf',
+ source => 'puppet:///modules/dsa_systemd/persistency.conf',
}
- # Make sure that the build and logs directories have the correct
- # permissions. This should go away once pybuildd issue #3 is
- # solved.
+ # Make sure that the build directory have the correct permissions.
+ # This should go away once pybuildd issue #3 is solved.
file { '/home/buildd/build':
ensure => directory,
mode => '2750',
group => buildd,
owner => buildd,
}
- file { '/home/buildd/logs':
- ensure => directory,
- mode => '2750',
- group => buildd,
- owner => buildd,
+ # work around https://salsa.debian.org/wb-team/pybuildd/issues/11
+ concat::fragment { 'dsa-puppet-stuff--pybuildd-expire-logs':
+ target => '/etc/cron.d/dsa-puppet-stuff',
+ content => @(EOF)
+ @daily buildd [ -d ~buildd/logs ] && find ~buildd/logs -type f -mtime +90 -delete
+ | EOF
}
} else {
#