From 549cc48d042fb7f9d4f310ce6d179492eb84ab16 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Wed, 19 Jul 2017 18:32:37 -0500
Subject: [PATCH] split ejabberd/ejabberd_xs config files names

---
 roles/ejabberd/tasks/main.yml                | 2 +-
 roles/ejabberd/templates/ejabberd-iiab.init  | 4 ++--
 roles/ejabberd_xs/tasks/main.yml             | 2 +-
 roles/ejabberd_xs/templates/ejabberd-xs.init | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/roles/ejabberd/tasks/main.yml b/roles/ejabberd/tasks/main.yml
index b3fcf3079..ec78415ae 100644
--- a/roles/ejabberd/tasks/main.yml
+++ b/roles/ejabberd/tasks/main.yml
@@ -15,7 +15,7 @@
             mode={{ item.mode }}
   with_items:
     - { src: 'ejabberd-iiab.cfg.j2', dest: '/etc/ejabberd/ejabberd-iiab.cfg' , mode: '0644' }
-    - { src: 'ejabberdctl.cfg.j2', dest: '/etc/ejabberd/ejabberdctl.cfg', mode: '0644' }
+    - { src: 'ejabberdctl-iiab.cfg.j2', dest: '/etc/ejabberd/ejabberdctl-iiab.cfg', mode: '0644' }
     - { src: 'ejabberd-iiab', dest: '/etc/sysconfig/ejabberd-iiab', mode: '0755' }
 #    - { src: 'ejabberd-domain-config', dest: '/etc/sysconfig/olpc-scripts/domain_config.d/ejabberd', mode: '0755'}
 #    - { src: 'ejabberd', dest: '/etc/sysconfig/olpc-scripts/domain_config.d/ejabberd' , mode: '0755' }
diff --git a/roles/ejabberd/templates/ejabberd-iiab.init b/roles/ejabberd/templates/ejabberd-iiab.init
index 43d747d90..a944ead9a 100755
--- a/roles/ejabberd/templates/ejabberd-iiab.init
+++ b/roles/ejabberd/templates/ejabberd-iiab.init
@@ -27,7 +27,7 @@ if [ -r /etc/sysconfig/ejabberd-iiab ]; then
 fi
 
 if [ ! "$CONFIG_FILE" ]; then
-	CONFIG_FILE=/etc/ejabberd/ejabberd.cfg
+	CONFIG_FILE=/etc/ejabberd/ejabberd-iiab.cfg
 fi
 
 # /var/run is tmpfs in fc18, so need to create every time
@@ -149,7 +149,7 @@ start() {
 	fi
 
 	daemon --user=ejabberd $progctl start	--config $CONFIG_FILE \
-				--ctl-config /etc/ejabberd/ejabberdctl.cfg \
+				--ctl-config /etc/ejabberd/ejabberdctl-iiab.cfg \
 				--logs "/var/log/ejabberd" \
 				--spool "/var/lib/ejabberd/spool" \
 				2>/dev/null
diff --git a/roles/ejabberd_xs/tasks/main.yml b/roles/ejabberd_xs/tasks/main.yml
index 5131b9218..e73ecf7eb 100644
--- a/roles/ejabberd_xs/tasks/main.yml
+++ b/roles/ejabberd_xs/tasks/main.yml
@@ -34,7 +34,7 @@
             mode={{ item.mode }}
   with_items:
     - { src: 'ejabberd-xs.cfg.j2', dest: '/etc/ejabberd/ejabberd-xs.cfg' , mode: '0644' }
-    - { src: 'ejabberdctl.cfg.j2', dest: '/etc/ejabberd/ejabberdctl.cfg', mode: '0644' }
+    - { src: 'ejabberdctl.cfg.j2', dest: '/etc/ejabberd/ejabberdctl-xs.cfg', mode: '0644' }
     - { src: 'ejabberd-xs', dest: '/etc/sysconfig/ejabberd-xs', mode: '0755' }
 #    - { src: 'ejabberd-domain-config', dest: '/etc/sysconfig/olpc-scripts/domain_config.d/ejabberd', mode: '0755'}
 #    - { src: 'ejabberd', dest: '/etc/sysconfig/olpc-scripts/domain_config.d/ejabberd' , mode: '0755' }
diff --git a/roles/ejabberd_xs/templates/ejabberd-xs.init b/roles/ejabberd_xs/templates/ejabberd-xs.init
index 9bd07eea0..ca1ef8618 100755
--- a/roles/ejabberd_xs/templates/ejabberd-xs.init
+++ b/roles/ejabberd_xs/templates/ejabberd-xs.init
@@ -27,7 +27,7 @@ if [ -r /etc/sysconfig/ejabberd-xs ]; then
 fi
 
 if [ ! "$CONFIG_FILE" ]; then
-	CONFIG_FILE=/etc/ejabberd/ejabberd.cfg
+	CONFIG_FILE=/etc/ejabberd/ejabberd-xs.cfg
 fi
 
 # /var/run is tmpfs in fc18, so need to create every time
@@ -149,7 +149,7 @@ start() {
 	fi
 
 	daemon --user=ejabberd $progctl start	--config $CONFIG_FILE \
-				--ctl-config /etc/ejabberd/ejabberdctl.cfg \
+				--ctl-config /etc/ejabberd/ejabberdctl-xs.cfg \
 				--logs "/var/log/ejabberd" \
 				--spool "/var/lib/ejabberd/spool" \
 				2>/dev/null