X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Fmanifests%2Fpybuildd.pp;h=1eb8aa4f49d241d69b4a7e1ef286ba4fa7ad8790;hb=0cf65a8865b70976c5f1be158518e794036646a9;hp=b2c98e265371e21d3c161d52906e900f82b24ae1;hpb=079082a0c7925f9c019b7cbdd7dee728da3dea2e;p=mirror%2Fdsa-puppet.git diff --git a/modules/buildd/manifests/pybuildd.pp b/modules/buildd/manifests/pybuildd.pp index b2c98e265..1eb8aa4f4 100644 --- a/modules/buildd/manifests/pybuildd.pp +++ b/modules/buildd/manifests/pybuildd.pp @@ -21,13 +21,7 @@ class buildd::pybuildd { group => buildd, owner => buildd, } - file { '/var/lib/systemd/linger': - ensure => directory, - mode => '755', - } - file { "/var/lib/systemd/linger/buildd": - ensure => present, - } + dsa_systemd::linger { 'buildd': } file { '/etc/systemd/journald.conf.d': ensure => directory, mode => '755', @@ -45,8 +39,8 @@ class buildd::pybuildd { 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', + concat::fragment { 'puppet-crontab--pybuildd-expire-logs': + target => '/etc/cron.d/puppet-crontab', content => @(EOF) @daily buildd [ -d ~buildd/logs ] && find ~buildd/logs -type f -mtime +90 -delete | EOF