From dfe78fc1b8fa76baf53d33177271dfdb9d2e8de4 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sat, 4 Jan 2020 01:37:37 -0600 Subject: [PATCH] mediawiki tweaks --- roles/mediawiki/tasks/enable.yml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/roles/mediawiki/tasks/enable.yml b/roles/mediawiki/tasks/enable.yml index 3b780c43d..8d2370e96 100644 --- a/roles/mediawiki/tasks/enable.yml +++ b/roles/mediawiki/tasks/enable.yml @@ -3,12 +3,24 @@ src: /etc/apache2/sites-available/mediawiki.conf dest: /etc/apache2/sites-enabled/mediawiki.conf state: link - when: mediawiki_enabled and is_debuntu + when: mediawiki_enabled and not nginx_enabled - name: Remove mediawiki.conf if not mediawiki_enabled (debuntu) file: path: /etc/apache2/sites-enabled/mediawiki.conf state: absent + when: not mediawiki_enabled or nginx_enabled + +- name: Install {{ nginx_config_dir }}/mediawiki-nginx.conf from template, for http://box{{ mediawiki_url }} + template: + src: mediawiki-nginx.conf.j2 + dest: "{{ nginx_config_dir }}/mediawiki-nginx.conf" + when: mediawiki_enabled and nginx_enabled + +- name: Remove mediawiki-nginx.conf if not mediawiki_enabled (debuntu) + file: + path: "{{ nginx_config_dir }}/mediawiki-nginx.conf" + state: absent when: not mediawiki_enabled and is_debuntu - name: Restart Apache service ({{ apache_service }}) to enable/disable http://box{{ mediawiki_url }} @@ -16,24 +28,14 @@ name: "{{ apache_service }}" daemon_reload: yes state: restarted - -- name: Install {{ nginx_config_dir }}/mediawiki-nginx.conf from template, for http://box{{ mediawiki_url }} - template: - src: mediawiki-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/mediawiki-nginx.conf" - when: mediawiki_enabled - -- name: Remove mediawiki-nginx.conf if not mediawiki_enabled (debuntu) - file: - path: "{{ nginx_config_dir }}/mediawiki-nginx.conf" - state: absent - when: not mediawiki_enabled and is_debuntu + when: mediawiki_enabled and not nginx_enabled - name: Restart nginx service to enable/disable http://box{{ mediawiki_url }} systemd: name: nginx daemon_reload: yes state: restarted + when: nginx_enabled - name: Add 'mediawiki' variable values to {{ iiab_ini_file }} ini_file: