diff --git a/roles/mediawiki/tasks/install.yml b/roles/mediawiki/tasks/install.yml index a1efa4842..5a6d58e85 100644 --- a/roles/mediawiki/tasks/install.yml +++ b/roles/mediawiki/tasks/install.yml @@ -32,12 +32,12 @@ state: started name: "{{ mysql_service }}" -- name: Create MySQL mediawiki database +- name: Create MySQL database {{ iiab_mediawiki }} mysql_db: name: "{{ mediawiki_db_name }}" state: present -- name: Create MySQL mediawiki database user +- name: Create MySQL database user {{ mediawiki_db_user }} mysql_user: name: "{{ mediawiki_db_user }}" password: "{{ mediawiki_db_user_password }}" @@ -62,25 +62,25 @@ chdir: "{{ mediawiki_abs_path }}" creates: "{{ mediawiki_abs_path }}/LocalSettings.php" -- name: Copy mediawiki.conf to enable http://box{{ mediawiki_url }} +- name: Copy mediawiki.conf to permit http://box{{ mediawiki_url }} template: src: mediawiki.conf.j2 dest: "/etc/{{ apache_config_dir }}/mediawiki.conf" -- name: Enable httpd conf file if we are disabled (debuntu) +- name: Enable mediawiki.conf if mediawiki_enabled (debuntu) file: src: /etc/apache2/sites-available/mediawiki.conf dest: /etc/apache2/sites-enabled/mediawiki.conf state: link when: mediawiki_enabled and is_debuntu -- name: Remove httpd conf file if we are disabled (OS's other than debuntu) +- name: Remove mediawiki.conf if not mediawiki_enabled (debuntu) file: path: /etc/apache2/sites-enabled/mediawiki.conf state: absent when: not mediawiki_enabled and is_debuntu -- name: Restart Apache, so it picks up the new aliases +- name: Restart Apache to enable/disable http://box{{ mediawiki_url }} service: name: "{{ apache_service }}" state: restarted