From 93b3fde101e93478ecec3f02029f29c6e1b978cc Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Mon, 18 May 2015 15:11:36 +0300
Subject: [PATCH] ejabberd: Move erlang installation into separate module

---
 ejabberd/manifests/init.pp | 14 +++++---------
 erlang/manifests/init.pp   | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 erlang/manifests/init.pp

diff --git a/ejabberd/manifests/init.pp b/ejabberd/manifests/init.pp
index 5defe68..629023f 100644
--- a/ejabberd/manifests/init.pp
+++ b/ejabberd/manifests/init.pp
@@ -82,6 +82,8 @@ class ejabberd(
     $ldap_password=undef
 ) {
 
+    require erlang
+
     include user::system
     realize(User["ejabberd"], Group["ejabberd"])
 
@@ -92,19 +94,13 @@ class ejabberd(
     case $::operatingsystem {
         "centos","redhat","fedora": {
             $package_provider = "rpm"
-            package { ["erlang", "erlang-esasl"]:
-                ensure => installed,
-                before => Package["ejabberd"],
-            }
         }
         "debian","ubuntu": {
             $package_provider = "dpkg"
-            package { ["erlang", "erlang-base"]:
-                ensure => installed,
-                before => Package["ejabberd"],
-            }
         }
-        default: { }
+        default: {
+            fail("ejabberd not supported on ${::operatingsystem}.")
+        }
     }
 
     if $collab == true {
diff --git a/erlang/manifests/init.pp b/erlang/manifests/init.pp
new file mode 100644
index 0000000..87bf7ca
--- /dev/null
+++ b/erlang/manifests/init.pp
@@ -0,0 +1,21 @@
+# Install erlang.
+#
+class erlang {
+
+  case $::operatingsystem {
+    'centos','redhat','fedora': {
+      package { 'erlang':
+        ensure => installed,
+      }
+    }
+    'debian','ubuntu': {
+      package { [ 'erlang', 'erlang-base' ]:
+        ensure => installed,
+      }
+    }
+    default: {
+      fail("erlang not supported on ${::operatingsystem}.")
+    }
+  }
+
+}