projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mirror-anu must not be in apache2_www_mirror if it is in static
[mirror/dsa-puppet.git]
/
modules
/
ferm
/
manifests
/
init.pp
diff --git
a/modules/ferm/manifests/init.pp
b/modules/ferm/manifests/init.pp
index
7115b7c
..
ae4ea19
100644
(file)
--- a/
modules/ferm/manifests/init.pp
+++ b/
modules/ferm/manifests/init.pp
@@
-77,7
+77,7
@@
class ferm {
mode => '0444',
}
file { '/etc/ferm/ferm.conf':
mode => '0444',
}
file { '/etc/ferm/ferm.conf':
-
source => 'puppet:///modules/ferm/ferm.conf'
,
+
content => template('ferm/ferm.conf.erb')
,
notify => Service['ferm'],
}
file { '/etc/ferm/conf.d/me.conf':
notify => Service['ferm'],
}
file { '/etc/ferm/conf.d/me.conf':
@@
-105,6
+105,12
@@
class ferm {
file { '/etc/logrotate.d/ulogd':
ensure => absent,
}
file { '/etc/logrotate.d/ulogd':
ensure => absent,
}
+ file { '/etc/logrotate.d/ulogd.dpkg-bak':
+ ensure => absent,
+ }
+ file { '/etc/logrotate.d/ulogd.dpkg-dist':
+ ensure => absent,
+ }
} else {
file { '/etc/logrotate.d/ulogd':
source => 'puppet:///modules/ferm/logrotate-ulogd',
} else {
file { '/etc/logrotate.d/ulogd':
source => 'puppet:///modules/ferm/logrotate-ulogd',