From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 14 Sep 2011 02:01:28 +0000 (-0300)
Subject: Enhancing firewall::openvpn rules
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=79a30a8caef2bbbf6ba6b148c8a47c7787039c49;p=puppet-nodo.git

Enhancing firewall::openvpn rules
---

diff --git a/manifests/subsystems/firewall/openvpn.pp b/manifests/subsystems/firewall/openvpn.pp
index 51b31fe..f5e8c94 100644
--- a/manifests/subsystems/firewall/openvpn.pp
+++ b/manifests/subsystems/firewall/openvpn.pp
@@ -12,18 +12,25 @@ class firewall::openvpn {
     sourcezone      => 'loc',
     destinationzone => 'vpn', 
     policy          => 'ACCEPT',
-    order           => '1',
+    order           => '20',
   }
 
   shorewall::policy { 'vpn-loc':
     sourcezone      => 'vpn',
     destinationzone => 'loc', 
     policy          => 'ACCEPT',
-    order           => '1',
+    order           => '21',
+  }
+
+  shorewall::policy { 'fw-vpn':
+    sourcezone      => '$FW',
+    destinationzone => 'vpn', 
+    policy          => 'ACCEPT',
+    order           => '22',
   }
 
   shorewall::tunnel { 'openvpn':
-    tunnel_type => 'openvpn',
+    tunnel_type => 'openvpnclient',
     zone        => 'net',
   }
 }