duplicate shortwall service definitions now inclduded from services/*

5 files changed, 29 insertions, 26 deletions

diff --git a/puppet/modules/site_shorewall/manifests/monitor.pp b/puppet/modules/site_shorewall/manifests/monitor.pp
index af9f8bfe..f4ed4f7c 100644
--- a/puppet/modules/site_shorewall/manifests/monitor.pp
+++ b/puppet/modules/site_shorewall/manifests/monitor.pp
@@ -1,18 +1,8 @@
 class site_shorewall::monitor {
 
   include site_shorewall::defaults
+  include site_shorewall::service::http
+  include site_shorewall::service::https
 
-  shorewall::rule {
-      'net2fw-https':
-        source      => 'net',
-        destination => '$FW',
-        action      => 'HTTPS(ACCEPT)',
-        order       => 200;
-      'net2fw-http':
-        source      => 'net',
-        destination => '$FW',
-        action      => 'HTTP(ACCEPT)',
-        order       => 200;
-  }
 
 }
diff --git a/puppet/modules/site_shorewall/manifests/service/http.pp b/puppet/modules/site_shorewall/manifests/service/http.pp
new file mode 100644
index 00000000..74b874d5
--- /dev/null
+++ b/puppet/modules/site_shorewall/manifests/service/http.pp
@@ -0,0 +1,13 @@
+class site_shorewall::service::http {
+
+  include site_shorewall::defaults
+
+  shorewall::rule {
+      'net2fw-http':
+        source      => 'net',
+        destination => '$FW',
+        action      => 'HTTP(ACCEPT)',
+        order       => 200;
+  }
+
+}
diff --git a/puppet/modules/site_shorewall/manifests/service/https.pp b/puppet/modules/site_shorewall/manifests/service/https.pp
new file mode 100644
index 00000000..4a8b119c
--- /dev/null
+++ b/puppet/modules/site_shorewall/manifests/service/https.pp
@@ -0,0 +1,12 @@
+class site_shorewall::service::https {
+
+  include site_shorewall::defaults
+
+  shorewall::rule {
+      'net2fw-https':
+        source      => 'net',
+        destination => '$FW',
+        action      => 'HTTPS(ACCEPT)',
+        order       => 200;
+  }
+}
diff --git a/puppet/modules/site_shorewall/manifests/tor.pp b/puppet/modules/site_shorewall/manifests/tor.pp
index a72d9dfc..8fe21ee6 100644
--- a/puppet/modules/site_shorewall/manifests/tor.pp
+++ b/puppet/modules/site_shorewall/manifests/tor.pp
@@ -18,11 +18,7 @@ class site_shorewall::tor {
         destination => '$FW',
         action      => 'leap_tor(ACCEPT)',
         order       => 200;
-      'net2fw-http':
-        source      => 'net',
-        destination => '$FW',
-        action      => 'HTTP(ACCEPT)',
-        order       => 200;
   }
 
+  include site_shorewall::service::http
 }
diff --git a/puppet/modules/site_shorewall/manifests/webapp.pp b/puppet/modules/site_shorewall/manifests/webapp.pp
index ff9b7646..31a65b1b 100644
--- a/puppet/modules/site_shorewall/manifests/webapp.pp
+++ b/puppet/modules/site_shorewall/manifests/webapp.pp
@@ -1,13 +1,5 @@
 class site_shorewall::webapp {
 
   include site_shorewall::defaults
-
-  shorewall::rule {
-      'net2fw-https':
-        source      => 'net',
-        destination => '$FW',
-        action      => 'HTTPS(ACCEPT)',
-        order       => 200;
-  }
-
+  include site_shorewall::service::https
 }