diff options
| author | duritong <peter.meier+github@immerda.ch> | 2015-04-17 18:04:28 +0200 |
|---|---|---|
| committer | duritong <peter.meier+github@immerda.ch> | 2015-04-17 18:04:28 +0200 |
| commit | eaba8159fcfc38dbc72e2476e753b05ea7554d55 (patch) | |
| tree | 557b99ebcda44dc90427ef979347d96d953331c9 | |
| parent | db074b1848c874585506c7aa7794801d5045a8b6 (diff) | |
| parent | 07c863098f453d3ce67d64c2ac5c67d8cf4c6a25 (diff) | |
Merge pull request #9 from chihoko/master
Tunnel file incorrectly named
| -rw-r--r-- | files/boilerplate/tunnels.footer (renamed from files/boilerplate/tunnel.footer) | 0 | ||||
| -rw-r--r-- | files/boilerplate/tunnels.header (renamed from files/boilerplate/tunnel.header) | 0 | ||||
| -rw-r--r-- | manifests/init.pp | 2 | ||||
| -rw-r--r-- | manifests/tunnel.pp | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/files/boilerplate/tunnel.footer b/files/boilerplate/tunnels.footer index 5e12d1d..5e12d1d 100644 --- a/files/boilerplate/tunnel.footer +++ b/files/boilerplate/tunnels.footer diff --git a/files/boilerplate/tunnel.header b/files/boilerplate/tunnels.header index 638fd56..638fd56 100644 --- a/files/boilerplate/tunnel.header +++ b/files/boilerplate/tunnels.header diff --git a/manifests/init.pp b/manifests/init.pp index f096d86..5966bed 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -92,7 +92,7 @@ class shorewall( # http://www.shorewall.net/manpages/shorewall-providers.html 'providers', # See http://www.shorewall.net/manpages/shorewall-tunnels.html - 'tunnel', + 'tunnels', # See http://www.shorewall.net/MultiISP.html 'rtrules', ]:; diff --git a/manifests/tunnel.pp b/manifests/tunnel.pp index 2cac922..0e645c8 100644 --- a/manifests/tunnel.pp +++ b/manifests/tunnel.pp @@ -5,7 +5,7 @@ define shorewall::tunnel( $gateway_zones = '', $order = '1' ) { - shorewall::entry { "tunnel-${order}-${name}": + shorewall::entry { "tunnels-${order}-${name}": line => "# ${name}\n${tunnel_type} ${zone} ${gateway} ${gateway_zones}", } } |