diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-09-13 22:16:00 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-09-13 22:16:00 -0300 |
| commit | fc200fa2135f7bbc86564f17f476df6257affcf0 (patch) | |
| tree | 38880c121c0e81d37cb84cfea5215f956bf1767e | |
| parent | 236336c6755c569ff43589b1256f177f11cfb1a0 (diff) | |
Adding shorewall::tunnel
| -rw-r--r-- | manifests/base.pp | 1 | ||||
| -rw-r--r-- | manifests/init.pp | 2 | ||||
| -rw-r--r-- | manifests/tunnel.pp | 11 |
3 files changed, 14 insertions, 0 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 53600e7..be3b1f6 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -46,6 +46,7 @@ class shorewall::base { File["/var/lib/puppet/modules/shorewall/tcdevices"], File["/var/lib/puppet/modules/shorewall/tcrules"], File["/var/lib/puppet/modules/shorewall/tcclasses"], + File["/var/lib/puppet/modules/shorewall/tunnel"], ], require => Package[shorewall], } diff --git a/manifests/init.pp b/manifests/init.pp index f69a6f2..57dbeac 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -71,5 +71,7 @@ class shorewall { shorewall::managed_file { tcrules: } # See http://www.shorewall.net/3.0/traffic_shaping.htm shorewall::managed_file { tcclasses: } + # See http://www.shorewall.net/manpages/shorewall-tunnels.html + shorewall::managed_file { tunnel: } } diff --git a/manifests/tunnel.pp b/manifests/tunnel.pp new file mode 100644 index 0000000..e0c71e7 --- /dev/null +++ b/manifests/tunnel.pp @@ -0,0 +1,11 @@ +define shorewall::tunnel( + $tunnel_type, + $zone, + $gateway = '0.0.0.0/0', + $gateway_zones = '', + $order = '1' +) { + shorewall::entry { "tunnel.d/${order}-${title}": + line => "# ${name}\n${tunnel_type} ${zone} ${gateway} ${gateway_zones}", + } +} |