Parameters on firewall:ppp

diff --git a/manifests/ppp.pp b/manifests/ppp.pp
index 3082e92cee3cd89f706b93987009058f834f7408..e9ce789ab5f49e2c81a6eb436d8fb12905850b8c 100644 (file)
--- a/manifests/ppp.pp
+++ b/manifests/ppp.pp
@@ -1,31 +1,36 @@
-class firewall::ppp {
-  shorewall::zone { 'ppp':
-    type  => 'ipv4',
-    order => 4,
+class firewall::ppp(
+  $interface = 'ppp0',
+  $zone      = 'ppp'
+) {
+  shorewall::interface { $interface:
+    zone => $zone,
   }
 
-  shorewall::interface { 'ppp0':
-    zone => 'ppp',
-  }
+  if $zone == 'ppp' {
+    shorewall::zone { 'ppp':
+      type  => 'ipv4',
+      order => 4,
+    }
 
-  shorewall::policy { 'loc-ppp':
-    sourcezone      => 'loc',
-    destinationzone => 'ppp', 
-    policy          => 'ACCEPT',
-    order           => 30,
-  }
+    shorewall::policy { 'loc-ppp':
+      sourcezone      => 'loc',
+      destinationzone => $zone,
+      policy          => 'ACCEPT',
+      order           => 30,
+    }
 
-  shorewall::policy { 'ppp-loc':
-    sourcezone      => 'ppp',
-    destinationzone => 'loc', 
-    policy          => 'ACCEPT',
-    order           => 31,
-  }
+    shorewall::policy { 'ppp-loc':
+      sourcezone      => 'ppp',
+      destinationzone => $zone,
+      policy          => 'ACCEPT',
+      order           => 31,
+    }
 
-  shorewall::policy { 'fw-ppp':
-    sourcezone      => '$FW',
-    destinationzone => 'ppp', 
-    policy          => 'ACCEPT',
-    order           => 32,
+    shorewall::policy { 'fw-ppp':
+      sourcezone      => '$FW',
+      destinationzone => $zone,
+      policy          => 'ACCEPT',
+      order           => 32,
+    }
   }
 }