From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 19 May 2016 16:09:14 +0000 (-0400)
Subject: More 16.04/ejabberd updates
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=9cfacfd9c1f286f1ee3800a60091a8f9f5905835;p=working%2Frandom.git

More 16.04/ejabberd updates

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/installer/16.04-xenial/eg_xenial_installer.sh b/installer/16.04-xenial/eg_xenial_installer.sh
index b16795f94..fb6adeae0 100755
--- a/installer/16.04-xenial/eg_xenial_installer.sh
+++ b/installer/16.04-xenial/eg_xenial_installer.sh
@@ -299,13 +299,13 @@ EOF
     fi
     echo Return Value = $?
     # Patch Ejabberd and register users
-    if [ ! "$(grep 'public.localhost' /etc/ejabberd/ejabberd.cfg)" ]; then
+    if [ ! "$(grep 'public.localhost' /etc/ejabberd/ejabberd.yml)" ]; then
         cd /etc/ejabberd/
         service ejabberd stop
         killall beam epmd; # just in case
-        cp ejabberd.cfg /root/ejabberd.cfg.orig
+        cp ejabberd.yml /root/ejabberd.yml.orig
         patch -p0 < $BASE_DIR/ejabberd.EG.patch
-        chown ejabberd:ejabberd ejabberd.cfg
+        chown ejabberd:ejabberd ejabberd.yml
         cd /etc/default/
         patch -p0 < $BASE_DIR/ejabberd.EG.defaults.patch
         echo starting ejabberd after patching
diff --git a/installer/16.04-xenial/ejabberd.EG.patch b/installer/16.04-xenial/ejabberd.EG.patch
index abcc90875..828f42b20 100644
--- a/installer/16.04-xenial/ejabberd.EG.patch
+++ b/installer/16.04-xenial/ejabberd.EG.patch
@@ -1,5 +1,5 @@
 --- ejabberd.orig.yml	2016-05-19 11:50:11.973825054 -0400
-+++ /etc/ejabberd/ejabberd.yml	2016-05-19 11:53:47.231608677 -0400
++++ ejabberd.yml	2016-05-19 11:53:47.231608677 -0400
 @@ -82,6 +82,8 @@
  ##
  hosts: