diff options
| author | Micah Anderson <micah@riseup.net> | 2013-06-14 13:38:02 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-06-14 13:38:02 -0400 |
| commit | dd8491acea7fdd2324ec6db853ff0fd438d9b54a (patch) | |
| tree | 3f2b18100b17aceb284c15dc2c8541a15d30dabb | |
| parent | c9a0c9da478ed1bc20acbdffa3b9ba40e656bd8a (diff) | |
| parent | 565be1bb06ededc8deb8e3a06864ce709b7bdffc (diff) | |
Merge branch 'master' of ssh://code.leap.se/puppet_shorewall into leap
| -rw-r--r-- | manifests/rtrules.pp | 2 | ||||
| -rw-r--r-- | manifests/tunnel.pp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/rtrules.pp b/manifests/rtrules.pp index 34e12b4..3810f26 100644 --- a/manifests/rtrules.pp +++ b/manifests/rtrules.pp @@ -5,7 +5,7 @@ define shorewall::rtrules( $priority = '10000', $mark, ){ - shorewall::entry { "rtrules.d/${mark}-${title}": + shorewall::entry { "rtrules-${mark}-${name}": line => "# ${name}\n${source} ${destination} ${provider} ${priority} ${mark}", } } diff --git a/manifests/tunnel.pp b/manifests/tunnel.pp index e0c71e7..2cac922 100644 --- a/manifests/tunnel.pp +++ b/manifests/tunnel.pp @@ -5,7 +5,7 @@ define shorewall::tunnel( $gateway_zones = '', $order = '1' ) { - shorewall::entry { "tunnel.d/${order}-${title}": + shorewall::entry { "tunnel-${order}-${name}": line => "# ${name}\n${tunnel_type} ${zone} ${gateway} ${gateway_zones}", } } |