projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dammit. ferm is smarter than me
[mirror/dsa-puppet.git]
/
modules
/
ferm
/
manifests
/
init.pp
diff --git
a/modules/ferm/manifests/init.pp
b/modules/ferm/manifests/init.pp
index
d97e181
..
0fa6063
100644
(file)
--- a/
modules/ferm/manifests/init.pp
+++ b/
modules/ferm/manifests/init.pp
@@
-1,28
+1,25
@@
class ferm {
class ferm {
- define
ferm_
rule($domain="ip", $chain="INPUT", $rule, $description="", $prio="00") {
+ define rule($domain="ip", $chain="INPUT", $rule, $description="", $prio="00") {
file { "/etc/ferm/dsa.d/${prio}_${name}":
ensure => present,
owner => root,
group => root,
file { "/etc/ferm/dsa.d/${prio}_${name}":
ensure => present,
owner => root,
group => root,
- mode => 0
6
00,
+ mode => 0
4
00,
content => template("ferm/ferm-rule.erb"),
content => template("ferm/ferm-rule.erb"),
+ notify => Exec["ferm restart"],
}
}
}
}
- package { ferm: ensure => installed }
-
file {
file {
+ "/etc/ferm":
+ ensure => directory;
"/etc/ferm/dsa.d":
"/etc/ferm/dsa.d":
- ensure => directory,
- require => Package["ferm"];
- "/etc/ferm/dsa.d/me.conf":
- content => template("ferm/me.conf.erb"),
- require => Package["ferm"],
- notify => Exec["ferm restart"];
+ ensure => directory;
}
exec { "ferm restart":
}
exec { "ferm restart":
-
path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin
",
+
command => "/bin/true
",
refreshonly => true,
}
refreshonly => true,
}
+
}
}