From 23d30e368ba1ebc8f6e9f153a73cf64b30a19ae2 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 5 May 2018 11:23:39 -0400
Subject: [PATCH] ejabberd-iiab.service 755->644; ejabberd-iiab.init 644->755

---
 roles/ejabberd/tasks/main.yml | 77 ++++++++++++++++++++---------------
 1 file changed, 44 insertions(+), 33 deletions(-)

diff --git a/roles/ejabberd/tasks/main.yml b/roles/ejabberd/tasks/main.yml
index 3e99df865..d267d8202 100644
--- a/roles/ejabberd/tasks/main.yml
+++ b/roles/ejabberd/tasks/main.yml
@@ -1,68 +1,79 @@
 - name: Install ejabberd packages
-  package: name={{ item }}
-           state=present
+  package:
+    name: "{{ item }}"
+    state: present
   with_items:
    - ejabberd
   tags:
     - download
 
 - name: Configure ejabberd
-  template: backup=yes
-            src={{ item.src }}
-            dest={{ item.dest }}
-            owner=root
-            group=root
-            mode={{ item.mode }}
+  template:
+    backup: yes
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    owner: root
+    group: root
+    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-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' }
-    - { src: 'ejabberd-iiab.service.j2', dest: '/etc/systemd/system/ejabberd-iiab.service', 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' }
+    - { src: 'ejabberd-iiab.service.j2', dest: '/etc/systemd/system/ejabberd-iiab.service', mode: '0644' }
     - { src: 'iiab-ejabberd-srg', dest: '/usr/bin/iiab-ejabberd-srg' , mode: '0755' }
-#    - { src: '10-ejabberdmoodle', dest: '/etc/sudoers.d/10-ejabberdmoodle', mode: '0440' }
+    #- { src: '10-ejabberdmoodle', dest: '/etc/sudoers.d/10-ejabberdmoodle', mode: '0440' }
     - { src: 'ejabberd.tmpfiles', dest: '/etc/tmpfiles.d/ejabberd.conf', mode: '0640' }
   register: ejabberd_config
 
 - name: Stop and disable OS provided systemd ejabberd service
-  service: name=ejabberd
-           state=stopped
-           enabled=no
+  service:
+    name: ejabberd
+    state: stopped
+    enabled: no
 
 - name: Put the startup script in place - debian
-  template: src='ejabberd-iiab.init'
-            dest='/etc/init.d/ejabberd-iiab'
+  template:
+    src: ejabberd-iiab.init
+    dest: /etc/init.d/ejabberd-iiab
+    mode: 0755
   when: is_debuntu
 
 - name: Put the startup script in place - non debian
-  template: src='ejabberd-iiab.init'
-            dest='/usr/libexec/ejabberd-iiab'
+  template:
+    src: ejabberd-iiab.init
+    dest: /usr/libexec/ejabberd-iiab
+    mode: 0755
   when: not is_debuntu
 
 - name: Remove ejabberd_domain if domain changes
-  file: path=/etc/sysconfig/ejabberd_domain_name
-        state=absent
+  file:
+    path: /etc/sysconfig/ejabberd_domain_name
+    state: absent
   when: ejabberd_config.changed
 
 - name: Enable ejabberd service
-  file: src=/etc/systemd/system/ejabberd-iiab.service
-        dest=/etc/systemd/system/multi-user.target.wants/ejabberd-iiab.service
-        owner=root
-        group=root
-        state=link
+  file:
+    src: /etc/systemd/system/ejabberd-iiab.service
+    dest: /etc/systemd/system/multi-user.target.wants/ejabberd-iiab.service
+    owner: root
+    group: root
+    state: link
 
 - name: Start ejabberd service
-  service: name=ejabberd-iiab
-           state=restarted
-           enabled=yes
+  service:
+    name: ejabberd-iiab
+    state: restarted
+    enabled: yes
   when: ejabberd_config.changed and ejabberd_enabled
 
 - name: Wait for ejabberd service start
-  wait_for: port=5280
-            delay=15
-            state=started
-            timeout=300
+  wait_for:
+    port: 5280
+    delay: 15
+    state: started
+    timeout: 300
   when: ejabberd_config.changed and ejabberd_enabled
 
 # ejabberd-iiab.init has the logic for the below, needs to be done once