projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eximconf: only define RT_SUBJECT on RT master
[mirror/dsa-puppet.git]
/
modules
/
buildd
/
manifests
/
pybuildd.pp
diff --git
a/modules/buildd/manifests/pybuildd.pp
b/modules/buildd/manifests/pybuildd.pp
index
6f73b05
..
1eb8aa4
100644
(file)
--- a/
modules/buildd/manifests/pybuildd.pp
+++ b/
modules/buildd/manifests/pybuildd.pp
@@
-1,5
+1,5
@@
# pybuildd configuration
# pybuildd configuration
-class buildd {
+class buildd
::pybuildd
{
package { 'buildd':
ensure => purged,
}
package { 'buildd':
ensure => purged,
}
@@
-21,13
+21,7
@@
class buildd {
group => buildd,
owner => buildd,
}
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',
file { '/etc/systemd/journald.conf.d':
ensure => directory,
mode => '755',
@@
-45,8
+39,8
@@
class buildd {
owner => buildd,
}
# work around https://salsa.debian.org/wb-team/pybuildd/issues/11
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
content => @(EOF)
@daily buildd [ -d ~buildd/logs ] && find ~buildd/logs -type f -mtime +90 -delete
| EOF