From 5c0d817778b57b253c7443145fa928547f48e9f5 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sat, 9 Feb 2013 15:05:16 +0100
Subject: site_shorewall::monitor: allow port 80 + 443

---
 puppet/modules/site_shorewall/manifests/monitor.pp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 puppet/modules/site_shorewall/manifests/monitor.pp

(limited to 'puppet/modules/site_shorewall/manifests/monitor.pp')

diff --git a/puppet/modules/site_shorewall/manifests/monitor.pp b/puppet/modules/site_shorewall/manifests/monitor.pp
new file mode 100644
index 00000000..af9f8bfe
--- /dev/null
+++ b/puppet/modules/site_shorewall/manifests/monitor.pp
@@ -0,0 +1,18 @@
+class site_shorewall::monitor {
+
+  include site_shorewall::defaults
+
+  shorewall::rule {
+      'net2fw-https':
+        source      => 'net',
+        destination => '$FW',
+        action      => 'HTTPS(ACCEPT)',
+        order       => 200;
+      'net2fw-http':
+        source      => 'net',
+        destination => '$FW',
+        action      => 'HTTP(ACCEPT)',
+        order       => 200;
+  }
+
+}
-- 
cgit v1.2.3


From b754c9f3412441c58e90fa57dc236fab74cee167 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 11 Feb 2013 15:20:05 +0100
Subject: duplicate shortwall service definitions now inclduded from services/*

---
 puppet/modules/site_shorewall/manifests/monitor.pp | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'puppet/modules/site_shorewall/manifests/monitor.pp')

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;
-  }
 
 }
-- 
cgit v1.2.3