projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stop using virtual resources for ferm::rule
[mirror/dsa-puppet.git]
/
modules
/
ferm
/
manifests
/
init.pp
diff --git
a/modules/ferm/manifests/init.pp
b/modules/ferm/manifests/init.pp
index
196a39e
..
781a4a1
100644
(file)
--- a/
modules/ferm/manifests/init.pp
+++ b/
modules/ferm/manifests/init.pp
@@
-7,10
+7,6
@@
# include ferm
#
class ferm {
# include ferm
#
class ferm {
- # realize (i.e. enable) all @ferm::rule virtual resources
- Ferm::Rule <| |>
- Ferm::Conf <| |>
-
File { mode => '0400' }
package { 'ferm':
File { mode => '0400' }
package { 'ferm':
@@
-93,14
+89,14
@@
class ferm {
content => template('ferm/conf.d-munin-interfaces.conf.erb'),
notify => Exec['ferm reload'],
}
content => template('ferm/conf.d-munin-interfaces.conf.erb'),
notify => Exec['ferm reload'],
}
-
@
ferm::rule { 'dsa-munin-interfaces-in':
+ ferm::rule { 'dsa-munin-interfaces-in':
prio => '001',
description => 'munin accounting',
chain => 'INPUT',
domain => '(ip ip6)',
rule => 'daddr ($MUNIN_IPS) NOP'
}
prio => '001',
description => 'munin accounting',
chain => 'INPUT',
domain => '(ip ip6)',
rule => 'daddr ($MUNIN_IPS) NOP'
}
-
@
ferm::rule { 'dsa-munin-interfaces-out':
+ ferm::rule { 'dsa-munin-interfaces-out':
prio => '001',
description => 'munin accounting',
chain => 'OUTPUT',
prio => '001',
description => 'munin accounting',
chain => 'OUTPUT',