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/service/http.pp  | 13 +++++++++++++
 puppet/modules/site_shorewall/manifests/service/https.pp | 12 ++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 puppet/modules/site_shorewall/manifests/service/http.pp
 create mode 100644 puppet/modules/site_shorewall/manifests/service/https.pp

(limited to 'puppet/modules/site_shorewall/manifests/service')

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


From 102af94df02decef888bac09748dbac6773dedd6 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 12 Feb 2013 13:26:42 +0100
Subject: fixed shorewall is blocking api port (Bug #1735)

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

(limited to 'puppet/modules/site_shorewall/manifests/service')

diff --git a/puppet/modules/site_shorewall/manifests/service/webapp_api.pp b/puppet/modules/site_shorewall/manifests/service/webapp_api.pp
new file mode 100644
index 00000000..9d4296e5
--- /dev/null
+++ b/puppet/modules/site_shorewall/manifests/service/webapp_api.pp
@@ -0,0 +1,21 @@
+class site_shorewall::service::webapp_api {
+
+  $api = hiera('api')
+  $api_port = $api['port']
+
+  # define macro for incoming services
+  file { '/etc/shorewall/macro.leap_webapp_api':
+    content => "PARAM   -       -       tcp    $api_port ",
+    notify  => Service['shorewall']
+  }
+
+
+  shorewall::rule {
+      'net2fw-webapp_api':
+        source      => 'net',
+        destination => '$FW',
+        action      => 'leap_webapp_api(ACCEPT)',
+        order       => 200;
+  }
+
+}
-- 
cgit v1.2.3


From 2e5eec3856b58aaff0a2049599a6455e6ff91122 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 12 Feb 2013 13:31:55 -0500
Subject: missed one require => Package['shorewall'] on of the file resources
 in site_shorewall

---
 puppet/modules/site_shorewall/manifests/service/webapp_api.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'puppet/modules/site_shorewall/manifests/service')

diff --git a/puppet/modules/site_shorewall/manifests/service/webapp_api.pp b/puppet/modules/site_shorewall/manifests/service/webapp_api.pp
index 9d4296e5..0c6c824d 100644
--- a/puppet/modules/site_shorewall/manifests/service/webapp_api.pp
+++ b/puppet/modules/site_shorewall/manifests/service/webapp_api.pp
@@ -6,7 +6,8 @@ class site_shorewall::service::webapp_api {
   # define macro for incoming services
   file { '/etc/shorewall/macro.leap_webapp_api':
     content => "PARAM   -       -       tcp    $api_port ",
-    notify  => Service['shorewall']
+    notify  => Service['shorewall'],
+    require => Package['shorewall']
   }
 
 
-- 
cgit v1.2.3