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/extension_script.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/extension_script.pp')
| -rw-r--r-- | manifests/extension_script.pp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/manifests/extension_script.pp b/manifests/extension_script.pp index 510536b..569fcbf 100644 --- a/manifests/extension_script.pp +++ b/manifests/extension_script.pp @@ -2,13 +2,13 @@ define shorewall::extension_script($script = '') { case $name { 'init', 'initdone', 'start', 'started', 'stop', 'stopped', 'clear', 'refresh', 'continue', 'maclog': { - shorewall::managed_file { "${name}": } - shorewall::entry { "${name}.d/500-${hostname}": - line => "${script}\n"; - } + file { "/etc/shorewall/puppet/${name}": + content => "${script}\n", + notify => Service[shorewall]; + } } '', default: { - err("${name}: unknown shorewall extension script") + err("${name}: unknown shorewall extension script") } } } |