external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

adjust tasks for rename and disable online group creation in ansible

Browse source
This commit is contained in:
Jerry Vonau 2017-07-19 16:10:32 -05:00
parent 105c1c8b4a
commit a1609bfa1d
2 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

40
roles/ejabberd/tasks/main.yml
View file

@ -14,25 +14,25 @@
group=root group=root
mode={{ item.mode }} mode={{ item.mode }}
with_items: with_items:
- { src: 'ejabberd-xs.cfg.j2', dest: '/etc/ejabberd/ejabberd-xs.cfg' , mode: '0644' } - { 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.cfg.j2', dest: '/etc/ejabberd/ejabberdctl.cfg', mode: '0644' }
- { src: 'ejabberd-xs', dest: '/etc/sysconfig/ejabberd-xs', mode: '0755' } - { 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-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', dest: '/etc/sysconfig/olpc-scripts/domain_config.d/ejabberd' , mode: '0755' }
- { src: 'ejabberd-xs.service.j2', dest: '/etc/systemd/system/ejabberd-xs.service', mode: '0755' } - { src: 'ejabberd-iiab.service.j2', dest: '/etc/systemd/system/ejabberd-iiab.service', mode: '0755' }
- { src: 'xs-ejabberd-srg', dest: '/usr/bin/xs-ejabberd-srg' , mode: '0755' } - { 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' } - { src: 'ejabberd.tmpfiles', dest: '/etc/tmpfiles.d/ejabberd.conf', mode: '0640' }
register: ejabberd_config register: ejabberd_config
- name: Put the startup script in place - debian - name: Put the startup script in place - debian
template: src='ejabberd-xs.init' template: src='ejabberd-iiab.init'
dest='/etc/init.d/ejabberd-xs' dest='/etc/init.d/ejabberd-iiab'
when: is_debuntu when: is_debuntu
- name: Put the startup script in place - non debian - name: Put the startup script in place - non debian
template: src='ejabberd-xs.init' template: src='ejabberd-iiab.init'
dest='/usr/libexec/ejabberd-xs' dest='/usr/libexec/ejabberd-iiab'
when: not is_debuntu when: not is_debuntu
- name: Remove ejabberd_domain if domain changes - name: Remove ejabberd_domain if domain changes
@ -41,14 +41,14 @@
when: ejabberd_config.changed when: ejabberd_config.changed
- name: Enable ejabberd service - name: Enable ejabberd service
file: src=/etc/systemd/system/ejabberd-xs.service file: src=/etc/systemd/system/ejabberd-iiab.service
dest=/etc/systemd/system/multi-user.target.wants/ejabberd-xs.service dest=/etc/systemd/system/multi-user.target.wants/ejabberd-iiab.service
owner=root owner=root
group=root group=root
state=link state=link
- name: Start ejabberd service - name: Start ejabberd service
service: name=ejabberd-xs service: name=ejabberd-iiab
state=restarted state=restarted
enabled=yes enabled=yes
when: ejabberd_config.changed and ejabberd_enabled when: ejabberd_config.changed and ejabberd_enabled
@ -60,10 +60,14 @@
timeout=300 timeout=300
when: ejabberd_config.changed and ejabberd_enabled when: ejabberd_config.changed and ejabberd_enabled
- name: Create online group # ejabberd-iiab.init has the logic for the below, needs to be done once
shell: ejabberdctl srg_create Online "schoolserver" Online "Online_Users" Online # and only if the group does not exist based on presence of
when: ejabberd_config.changed and not is_debuntu # /var/lib/ejabberd online_src_created
- name: Add all users to online group #- name: Create online group
shell: ejabberdctl srg_user_add '@online@' "schoolserver" Online "schoolserver" # shell: ejabberdctl srg_create Online "{{ iiab_hostname }}" Online "Online_Users" Online
when: ejabberd_config.changed and not is_debuntu # when: ejabberd_config.changed
#- name: Add all users to online group
# shell: ejabberdctl srg_user_add '@online@' "{{ iiab_hostname }}" Online "schoolserver"
# when: ejabberd_config.changed

15
roles/ejabberd_xs/tasks/main.yml
View file

@ -76,13 +76,10 @@
timeout=300 timeout=300
when: ejabberd_config.changed and ejabberd_xs_enabled when: ejabberd_config.changed and ejabberd_xs_enabled
- name: Create online group #- name: Create online group
shell: ejabberdctl srg_create Online "schoolserver" Online "Online_Users" Online # shell: ejabberdctl srg_create Online "schoolserver" Online "Online_Users" Online
when: ejabberd_config.changed and not is_debuntu and ejabberd_xs_enabled # when: ejabberd_config.changed and not is_debuntu and ejabberd_xs_enabled
- name: Add all users to online group
shell: ejabberdctl srg_user_add '@online@' "schoolserver" Online "schoolserver"
when: ejabberd_config.changed and not is_debuntu and ejabberd_xs_enabled
#- name: Add all users to online group
# shell: ejabberdctl srg_user_add '@online@' "schoolserver" Online "schoolserver"
# when: ejabberd_config.changed and not is_debuntu and ejabberd_xs_enabled