differentiate between general jabberserver and openfire

diff --git a/manifests/rules/jabberserver.pp b/manifests/rules/jabberserver.pp
index 2017aea61ef66b9bc86d9bbdfaca473dc3ffc51f..3b38b294d176667cff21c11569da6879314f69f6 100644 (file)
--- a/manifests/rules/jabberserver.pp
+++ b/manifests/rules/jabberserver.pp
@@ -4,7 +4,7 @@ class shorewall::rules::jabberserver {
             source          => 'net',
             destination     => '$FW',
             proto           => 'tcp',
-            destinationport => '5222,5223,5269,7777',
+            destinationport => '5222,5223,5269',
             order           => 240,
             action          => 'ACCEPT';
     'me-net-tcp_jabber_s2s':

diff --git a/manifests/rules/openfire.pp b/manifests/rules/openfire.pp
new file mode 100644 (file)
index 0000000..0e6d1d8
--- /dev/null
+++ b/manifests/rules/openfire.pp
@@ -0,0 +1,12 @@
+class shorewall::rules::openfire {
+  include shorewall::rules::jaberserver
+
+  shorewall::rule { 'me-all-openfire-tcp':
+    source          => '$FW',
+    destination     => 'all',
+    proto           => 'tcp',
+    destinationport => '7070,7443,7777',
+    order           => 240,
+    action          => 'ACCEPT';
+  }
+}