diff options
| author | Micah Anderson <micah@riseup.net> | 2012-06-20 14:05:32 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-06-20 14:05:32 -0400 |
| commit | c3629ee738066eceb16606c47486d3ae1262b812 (patch) | |
| tree | 3e9a62dee514dbe70dfe867441281a62a931ffa9 | |
| parent | 2ebf9988ede4c54082abf9a5da98f4456464568a (diff) | |
| download | puppet-shorewall-c3629ee738066eceb16606c47486d3ae1262b812.tar.gz puppet-shorewall-c3629ee738066eceb16606c47486d3ae1262b812.tar.bz2 | |
update additions to concat module that were not in immerda branch
| -rw-r--r-- | manifests/extension_script.pp | 2 | ||||
| -rw-r--r-- | manifests/tcclasses.pp | 2 | ||||
| -rw-r--r-- | manifests/tcdevices.pp | 2 | ||||
| -rw-r--r-- | manifests/tcrules.pp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/manifests/extension_script.pp b/manifests/extension_script.pp index 510536b..e045ce3 100644 --- a/manifests/extension_script.pp +++ b/manifests/extension_script.pp @@ -3,7 +3,7 @@ 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}": + shorewall::entry { "extension_script-${order}-${name}": line => "${script}\n"; } } diff --git a/manifests/tcclasses.pp b/manifests/tcclasses.pp index 2126bb7..4e30a55 100644 --- a/manifests/tcclasses.pp +++ b/manifests/tcclasses.pp @@ -6,7 +6,7 @@ define shorewall::tcclasses( $options = '', $order = '1' ){ - shorewall::entry { "tcclasses.d/${order}-${title}": + shorewall::entry { "tcclasses-${order}-${name}": line => "# ${name}\n${interface} ${order} ${rate} ${ceil} ${priority} ${options}", } } diff --git a/manifests/tcdevices.pp b/manifests/tcdevices.pp index 54c9665..f4e88d8 100644 --- a/manifests/tcdevices.pp +++ b/manifests/tcdevices.pp @@ -5,7 +5,7 @@ define shorewall::tcdevices( $redirected_interfaces = '', $order = '100' ){ - shorewall::entry { "tcdevices.d/${order}-${title}": + shorewall::entry { "tcdevices-${order}-${name}": line => "${name} ${in_bandwidth} ${out_bandwidth} ${options} ${redirected_interfaces}", } } diff --git a/manifests/tcrules.pp b/manifests/tcrules.pp index a888d20..b9ab4a9 100644 --- a/manifests/tcrules.pp +++ b/manifests/tcrules.pp @@ -6,7 +6,7 @@ define shorewall::tcrules( $client_ports = '', $order = '1' ){ - shorewall::entry { "tcrules.d/${order}-${title}": + shorewall::entry { "tcrules-${order}-${name}": line => "# ${name}\n${order} ${source} ${destination} ${protocol} ${ports} ${client_ports}", } } |