diff options
| author | varac <varacanero@zeromail.org> | 2012-12-14 13:16:30 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-12-14 13:16:30 +0100 |
| commit | b37f6e28a42304cabc87431d48c15a46cf9b0444 (patch) | |
| tree | 8975829b75bdfde48bac4485e25eb1c39f2e5987 | |
| parent | 063f3329cb6ff5769ea4667516d2f8c63cd236b6 (diff) | |
| parent | 221976d2814009710b1a392a451fc4684004c971 (diff) | |
Merge branch 'feature/openvpn_ip_forward' into develop
| -rw-r--r-- | .gitmodules | 5 | ||||
| m--------- | puppet/modules/augeas | 0 | ||||
| m--------- | puppet/modules/shorewall | 0 | ||||
| -rw-r--r-- | puppet/modules/site_shorewall/manifests/defaults.pp | 9 |
4 files changed, 12 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 417457e8..6597612b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,7 +24,7 @@ url = git://labs.riseup.net/shared-common [submodule "puppet/modules/shorewall"] path = puppet/modules/shorewall - url = git://labs.riseup.net/shared-shorewall + url = git://code.leap.se/puppet_shorewall [submodule "puppet/modules/resolvconf"] path = puppet/modules/resolvconf url = git://git.puppet.immerda.ch/module-resolvconf.git @@ -52,3 +52,6 @@ [submodule "puppet/modules/passenger"] path = puppet/modules/passenger url = git://code.leap.se/puppet_passenger +[submodule "puppet/modules/augeas"] + path = puppet/modules/augeas + url = git://code.leap.se/puppet_augeas diff --git a/puppet/modules/augeas b/puppet/modules/augeas new file mode 160000 +Subproject 44e84a988b859622e7b3583ac27331cf816017e diff --git a/puppet/modules/shorewall b/puppet/modules/shorewall -Subproject 911cc18e594bb5a3ab642ebb24615a0447050c3 +Subproject e511291a111db7a7d88a8820c5423aa5b92304e diff --git a/puppet/modules/site_shorewall/manifests/defaults.pp b/puppet/modules/site_shorewall/manifests/defaults.pp index 88981e5f..d348bf00 100644 --- a/puppet/modules/site_shorewall/manifests/defaults.pp +++ b/puppet/modules/site_shorewall/manifests/defaults.pp @@ -8,6 +8,13 @@ class site_shorewall::defaults { shorewall::zone {'net': type => 'ipv4'; } - shorewall::rule_section { 'NEW': order => 10; } + include augeas + + augeas { 'enable_ip_forwarding': + changes => 'set /files/etc/shorewall/shorewall.conf/IP_FORWARDING Yes', + lens => 'Shellvars.lns', + incl => '/etc/shorewall/shorewall.conf', + notify => Service[shorewall]; + } } |