diff options
author | intrigeri <intrigeri@boum.org> | 2012-11-11 23:10:20 +0100 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2012-11-11 23:10:20 +0100 |
commit | 8080f1a892a69dc171187c8165d7e81f5b5b512d (patch) | |
tree | 6e610ec18aaa13f7797eedd08b03c852e49d8cfb /manifests/rule.pp | |
parent | 911cc18e594bb5a3ab642ebb24615a0447050c32 (diff) | |
parent | 5052233d92e97263eab292408ed2602db0836d98 (diff) | |
download | puppet-shorewall-8080f1a892a69dc171187c8165d7e81f5b5b512d.tar.gz puppet-shorewall-8080f1a892a69dc171187c8165d7e81f5b5b512d.tar.bz2 |
Merge remote-tracking branch 'riseup/master' into tmp
Conflicts:
manifests/init.pp
Diffstat (limited to 'manifests/rule.pp')
-rw-r--r-- | manifests/rule.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/rule.pp b/manifests/rule.pp index d2188df..2fe91e2 100644 --- a/manifests/rule.pp +++ b/manifests/rule.pp @@ -13,8 +13,8 @@ define shorewall::rule( $mark = '', $order ){ - shorewall::entry{"rules.d/${order}-${title}": - ensure => $ensure, - line => "# ${name}\n${action} ${source} ${destination} ${proto} ${destinationport} ${sourceport} ${originaldest} ${ratelimit} ${user} ${mark}", - } + shorewall::entry{"rules-${order}-${name}": + ensure => $ensure, + line => "# ${name}\n${action} ${source} ${destination} ${proto} ${destinationport} ${sourceport} ${originaldest} ${ratelimit} ${user} ${mark}", + } } |