add shorewall rule, refactor

2 files changed, 23 insertions, 20 deletions

diff --git a/manifests/base.pp b/manifests/base.pp
new file mode 100644
index 0000000..fcb4712
--- /dev/null
+++ b/manifests/base.pp
@@ -0,0 +1,21 @@
+class ejabberd::base {
+    package{'ejabberd':
+        ensure => installed,
+    }
+
+    file{'/etc/ejabberd/ejabberd.cfg':
+      source => [ "puppet://$server/files/ejabberd/${fqdn}/ejabberd.cfg",
+                  "puppet://$server/files/ejabberd/ejabberd.cfg",
+                  "puppet://$server/ejabberd/ejabberd.cfg" ],
+      require => Package['ejabberd'],
+      notify => Service['ejabberd'],
+      owner => ejabberd, group => ejabberd, mode => 0640;
+    }
+
+    service{ejabberd:
+        ensure => running,
+        enable => true,
+        hasstatus => true, #fixme!
+        require => Package[ejabberd],
+    }
+}
diff --git a/manifests/init.pp b/manifests/init.pp
index 62f3e22..0eb6226 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,26 +13,8 @@ class ejabberd {
     if $use_munin {
         include ejabberd::munin
     }
-}
-
-class ejabberd::base {
-    package{'ejabberd':
-        ensure => installed,
-    }
-
-    file{'/etc/ejabberd/ejabberd.cfg':
-      source => [ "puppet://$server/files/ejabberd/${fqdn}/ejabberd.cfg",
-                  "puppet://$server/files/ejabberd/ejabberd.cfg",
-                  "puppet://$server/ejabberd/ejabberd.cfg" ],
-      require => Package['ejabberd'],
-      notify => Service['ejabberd'],
-      owner => ejabberd, group => ejabberd, mode => 0640;
-    }
 
-    service{ejabberd:
-        ensure => running,
-        enable => true,
-        hasstatus => true, #fixme!
-        require => Package[ejabberd],
+    if $use_shorewall {
+      include shorewall::rules::jabberserver
     }
 }