From c4d4f61068486be05245514b6101f56d48296441 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Sep 2018 01:13:33 -0400 Subject: [PATCH 01/10] MediaWiki 1.31.0 -> 1.31.1 --- roles/mediawiki/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mediawiki/defaults/main.yml b/roles/mediawiki/defaults/main.yml index e75396acb..af82c0c5e 100644 --- a/roles/mediawiki/defaults/main.yml +++ b/roles/mediawiki/defaults/main.yml @@ -1,5 +1,5 @@ mediawiki_major_version: "1.31" -mediawiki_minor_version: "0" +mediawiki_minor_version: "1" mediawiki_version: "{{ mediawiki_major_version }}.{{ mediawiki_minor_version }}" mediawiki_download_base_url: "https://releases.wikimedia.org/mediawiki/{{ mediawiki_major_version }}" From 7320ac82b308ca6b0239cd89ff13ac7b553bbf6b Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Sep 2018 18:27:53 -0400 Subject: [PATCH 02/10] articulate actions, educating implementer/operator --- roles/mediawiki/tasks/install.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/mediawiki/tasks/install.yml b/roles/mediawiki/tasks/install.yml index cd89c0c71..6a3fd41aa 100644 --- a/roles/mediawiki/tasks/install.yml +++ b/roles/mediawiki/tasks/install.yml @@ -8,7 +8,7 @@ tags: - download -- name: Download MediaWiki software, per roles/mediawiki/defaults/main.yml +- name: Download MediaWiki {{ mediawiki_version }} from wikimedia.org to {{ downloads_dir }} get_url: url: "{{ mediawiki_download_base_url }}/{{ mediawiki_src }}" dest: "{{ downloads_dir }}" @@ -18,7 +18,7 @@ register: mediawiki_download_output when: internet_available -- name: Unpack download to permanent location +- name: Unpack it to permanent location {{ mediawiki_abs_path }} unarchive: src: "{{ downloads_dir }}/{{ mediawiki_src }}" dest: "{{ mediawiki_install_path }}" From 8eb63c5236a545015c81bb12d94b9d168d05dbdb Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Sep 2018 18:30:50 -0400 Subject: [PATCH 03/10] Update install.yml --- roles/mediawiki/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mediawiki/tasks/install.yml b/roles/mediawiki/tasks/install.yml index 6a3fd41aa..1de4c1fc5 100644 --- a/roles/mediawiki/tasks/install.yml +++ b/roles/mediawiki/tasks/install.yml @@ -8,7 +8,7 @@ tags: - download -- name: Download MediaWiki {{ mediawiki_version }} from wikimedia.org to {{ downloads_dir }} +- name: Download {{ mediawiki_src }} from wikimedia.org to {{ downloads_dir }} get_url: url: "{{ mediawiki_download_base_url }}/{{ mediawiki_src }}" dest: "{{ downloads_dir }}" From e05726a8e096288075c49e3cc9a765adbbb8ccfd Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Sep 2018 18:35:36 -0400 Subject: [PATCH 04/10] Update install.yml --- roles/mediawiki/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mediawiki/tasks/install.yml b/roles/mediawiki/tasks/install.yml index 1de4c1fc5..a1efa4842 100644 --- a/roles/mediawiki/tasks/install.yml +++ b/roles/mediawiki/tasks/install.yml @@ -62,7 +62,7 @@ chdir: "{{ mediawiki_abs_path }}" creates: "{{ mediawiki_abs_path }}/LocalSettings.php" -- name: Copy mediawiki httpd conf file +- name: Copy mediawiki.conf to enable http://box{{ mediawiki_url }} template: src: mediawiki.conf.j2 dest: "/etc/{{ apache_config_dir }}/mediawiki.conf" From 2536530927c66a42accf2525ab9bd5012a7827ff Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Sep 2018 18:46:45 -0400 Subject: [PATCH 05/10] Update install.yml --- roles/mediawiki/tasks/install.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 From ce057245c86657284e157991bc5f1458f94cdb0a Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Sep 2018 18:49:36 -0400 Subject: [PATCH 06/10] Update install.yml --- roles/mediawiki/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mediawiki/tasks/install.yml b/roles/mediawiki/tasks/install.yml index 5a6d58e85..19af433f6 100644 --- a/roles/mediawiki/tasks/install.yml +++ b/roles/mediawiki/tasks/install.yml @@ -32,7 +32,7 @@ state: started name: "{{ mysql_service }}" -- name: Create MySQL database {{ iiab_mediawiki }} +- name: Create MySQL database {{ mediawiki_db_name }} mysql_db: name: "{{ mediawiki_db_name }}" state: present From c98e827588868ed14b89050d2d285c4a0a6c7d74 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Sep 2018 19:01:11 -0400 Subject: [PATCH 07/10] Update main.yml --- roles/mediawiki/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mediawiki/tasks/main.yml b/roles/mediawiki/tasks/main.yml index 6c77d3e7c..2a33dc83c 100644 --- a/roles/mediawiki/tasks/main.yml +++ b/roles/mediawiki/tasks/main.yml @@ -1,3 +1,3 @@ -- name: Include the install playbook +- name: Install MediaWiki {{ mediawiki_version }} if mediawiki_install include_tasks: install.yml when: mediawiki_install From b6eaf85b1fb03ba2ac3664364ae49172966cba60 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Sep 2018 19:05:56 -0400 Subject: [PATCH 08/10] Update install.yml --- roles/mediawiki/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mediawiki/tasks/install.yml b/roles/mediawiki/tasks/install.yml index 19af433f6..7e989778a 100644 --- a/roles/mediawiki/tasks/install.yml +++ b/roles/mediawiki/tasks/install.yml @@ -27,7 +27,7 @@ mode: 0755 keep_newer: yes -- name: MySQL database needs to be running if we are trying to create a new db +- name: Ensure MySQL is running, so we can create db service: state: started name: "{{ mysql_service }}" From e22de262032ab5743278bab23f6763abf600aa77 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Sep 2018 19:15:56 -0400 Subject: [PATCH 09/10] Update install.yml --- roles/mediawiki/tasks/install.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/mediawiki/tasks/install.yml b/roles/mediawiki/tasks/install.yml index 7e989778a..655d05e38 100644 --- a/roles/mediawiki/tasks/install.yml +++ b/roles/mediawiki/tasks/install.yml @@ -5,17 +5,17 @@ with_items: - "php{{ php_version }}-intl" - "php{{ php_version }}-mbstring" - tags: - - download + #tags: + # - download -- name: Download {{ mediawiki_src }} from wikimedia.org to {{ downloads_dir }} +- name: Download {{ mediawiki_download_base_url }}/{{ mediawiki_src }} to {{ downloads_dir }} get_url: url: "{{ mediawiki_download_base_url }}/{{ mediawiki_src }}" dest: "{{ downloads_dir }}" timeout: "{{ download_timeout }}" -# force: yes -# backup: yes - register: mediawiki_download_output + #force: yes + #backup: yes + #register: mediawiki_download_output when: internet_available - name: Unpack it to permanent location {{ mediawiki_abs_path }} From 93bdd5be08621872411a412f49a0192b60e9e838 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Sep 2018 19:23:04 -0400 Subject: [PATCH 10/10] Update install.yml --- roles/mediawiki/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mediawiki/tasks/install.yml b/roles/mediawiki/tasks/install.yml index 655d05e38..bba5386da 100644 --- a/roles/mediawiki/tasks/install.yml +++ b/roles/mediawiki/tasks/install.yml @@ -44,7 +44,7 @@ priv: "{{ mediawiki_db_name }}.*:ALL,GRANT" state: present -- name: Configure MediaWiki +- name: Configure MediaWiki, if {{ mediawiki_abs_path }}/LocalSettings.php doesn't exist shell: > php '{{ mediawiki_abs_path }}/maintenance/install.php' --dbname={{ mediawiki_db_name }}