From 3b5032cdb4e4d7e3e76e8ebbb70d55a4c63b9ed2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Sep 2018 00:49:37 -0400 Subject: [PATCH 01/25] Update packages.yml --- roles/2-common/tasks/packages.yml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml index f64c25936..fadfa9a26 100644 --- a/roles/2-common/tasks/packages.yml +++ b/roles/2-common/tasks/packages.yml @@ -14,16 +14,22 @@ - avahi-tools when: is_redhat -- name: Download usbmount -- not in Debian Stretch (debian-9) - get_url: - url: "{{ iiab_download_url }}/usbmount_0.0.14.1_all.deb" - dest: "{{ downloads_dir }}" +- name: Download & install usbmount, missing from Debian Stretch (debian-9) + apt: + deb: "{{ iiab_download_url }}/usbmount_0.0.14.1_all.deb" timeout: "{{ download_timeout }}" when: internet_available and is_debian_9 -- name: Install usbmount (debian-9) - command: apt install -y {{ downloads_dir }}/usbmount_0.0.14.1_all.deb - when: is_debian_9 +#- name: Download usbmount -- not in Debian Stretch (debian-9) +# get_url: +# url: "{{ iiab_download_url }}/usbmount_0.0.14.1_all.deb" +# dest: "{{ downloads_dir }}" +# timeout: "{{ download_timeout }}" +# when: internet_available and is_debian_9 +# +#- name: Install usbmount (debian-9) +# command: apt install -y {{ downloads_dir }}/usbmount_0.0.14.1_all.deb +# when: is_debian_9 - name: Install packages (debuntu) package: @@ -48,7 +54,7 @@ - mlocate - rsync - htop - - etckeeper + #- etckeeper # "nobody is really using etckeeper and it's bloating the filesystem every time apt runs" per @jvonau at https://github.com/iiab/iiab/issues/1146 - python-passlib - usbmount - net-tools @@ -65,7 +71,7 @@ - usbutils - hostapd - wget - - openssl #FC 18 does not supply, but pear requires + - openssl # FC 18 does not supply, but pear requires - gawk - curl - pandoc From 77c30ca3419941529c280e18d7e448f96af62d80 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Sep 2018 01:02:53 -0400 Subject: [PATCH 02/25] Update packages.yml --- roles/2-common/tasks/packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml index fadfa9a26..31284dc9c 100644 --- a/roles/2-common/tasks/packages.yml +++ b/roles/2-common/tasks/packages.yml @@ -17,7 +17,7 @@ - name: Download & install usbmount, missing from Debian Stretch (debian-9) apt: deb: "{{ iiab_download_url }}/usbmount_0.0.14.1_all.deb" - timeout: "{{ download_timeout }}" + #timeout: "{{ download_timeout }}" # Ansible's apt module doesn't support timeout parameter; that's ok as usbmount_0.0.14.1_all.deb is only 10KB when: internet_available and is_debian_9 #- name: Download usbmount -- not in Debian Stretch (debian-9) From c4d4f61068486be05245514b6101f56d48296441 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Sep 2018 01:13:33 -0400 Subject: [PATCH 03/25] 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 7626fe0e5d76e2cb4afe9c76d9a3726a7b96468a Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Sep 2018 02:09:38 -0400 Subject: [PATCH 04/25] Update default_vars.yml --- vars/default_vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index e1abea459..593ccd6d9 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -416,7 +416,7 @@ calibreweb_url: /books calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web -# PLEASE CONSIDER THESE 2 NEW MAPS APPROACHES INSTEAD, AS OF 2018: +# PLEASE CONSIDER THESE 2 NEW OPENSTREETMAP APPROACHES INSTEAD, AS OF 2018: # - http://download.iiab.io/content/OSM/vector-tiles/ # - http://oer2go.org/viewmod/en-worldmap-10 # From 3cecdec61c55845b635ddb1b443036e852b8d237 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Sep 2018 02:10:00 -0400 Subject: [PATCH 05/25] Update local_vars_min.yml --- vars/local_vars_min.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index ea593c810..81ebfd0be 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -250,7 +250,7 @@ calibreweb_url: /books calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web -# PLEASE CONSIDER THESE 2 NEW MAPS APPROACHES INSTEAD, AS OF 2018: +# PLEASE CONSIDER THESE 2 NEW OPENSTREETMAP APPROACHES INSTEAD, AS OF 2018: # - http://download.iiab.io/content/OSM/vector-tiles/ # - http://oer2go.org/viewmod/en-worldmap-10 # From 031edc5fef7d608a7db609fd76693659c383c1e7 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Sep 2018 02:10:19 -0400 Subject: [PATCH 06/25] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 1d06677b3..92893d08e 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -250,7 +250,7 @@ calibreweb_url: /books calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web -# PLEASE CONSIDER THESE 2 NEW MAPS APPROACHES INSTEAD, AS OF 2018: +# PLEASE CONSIDER THESE 2 NEW OPENSTREETMAP APPROACHES INSTEAD, AS OF 2018: # - http://download.iiab.io/content/OSM/vector-tiles/ # - http://oer2go.org/viewmod/en-worldmap-10 # From ef921ead7d6766bd761c83d5e15066944630a072 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Sep 2018 02:11:01 -0400 Subject: [PATCH 07/25] Update local_vars_big.yml --- vars/local_vars_big.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index eaf6ef161..1247b9351 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -250,7 +250,7 @@ calibreweb_url: /books calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web -# PLEASE CONSIDER THESE 2 NEW MAPS APPROACHES INSTEAD, AS OF 2018: +# PLEASE CONSIDER THESE 2 NEW OPENSTREETMAP APPROACHES INSTEAD, AS OF 2018: # - http://download.iiab.io/content/OSM/vector-tiles/ # - http://oer2go.org/viewmod/en-worldmap-10 # From ca1536a4ee66076ea281fc8975a55417ab127251 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 20 Sep 2018 03:47:45 -0400 Subject: [PATCH 08/25] Update README.rst --- roles/iiab-admin/README.rst | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/roles/iiab-admin/README.rst b/roles/iiab-admin/README.rst index 01f202d6e..6cc26b69e 100644 --- a/roles/iiab-admin/README.rst +++ b/roles/iiab-admin/README.rst @@ -1,5 +1,16 @@ +.. |ss| raw:: html + + + +.. |se| raw:: html + + + +.. |nbsp| unicode:: 0xA0 + :trim: + ================= -IIAB Admin README +iiab-admin README ================= This role is home to a number of administrative playbooks. Those implemented are: @@ -10,7 +21,7 @@ Add Administrative User * Add the iiab-admin user and password * N.B. to create password hash use python -c 'import crypt; print crypt.crypt("", "$6$<salt>")' * Make a sudoer -* Add /root/.ssh and dummy authorized_keys file as placeholder +* |ss| Add /root/.ssh and dummy authorized_keys file as placeholder |se| |nbsp| (moved to playbook roles/sshd) * Force password for sudoers Add Packages for Remote Access From c5bfc60081a361ec3c70180f8190a70d3a88be95 Mon Sep 17 00:00:00 2001 From: A Holt <holta@users.noreply.github.com> Date: Thu, 20 Sep 2018 03:50:41 -0400 Subject: [PATCH 09/25] Update main.yml --- roles/3-base-server/tasks/main.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/roles/3-base-server/tasks/main.yml b/roles/3-base-server/tasks/main.yml index 5443c2523..7efb55682 100644 --- a/roles/3-base-server/tasks/main.yml +++ b/roles/3-base-server/tasks/main.yml @@ -9,12 +9,6 @@ # has no "when: XXXXX_install" flag tags: base, httpd -- name: IIAB-ADMIN - include_role: - name: iiab-admin - # has no "when: XXXXX_install" flag - tags: base, iiab-admin - - name: MYSQL include_role: name: mysql From 3f9572b309d9c7cbdf4e3a0b7d6bce2c9c746808 Mon Sep 17 00:00:00 2001 From: A Holt <holta@users.noreply.github.com> Date: Thu, 20 Sep 2018 03:53:26 -0400 Subject: [PATCH 10/25] Update main.yml --- roles/1-prep/tasks/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/1-prep/tasks/main.yml b/roles/1-prep/tasks/main.yml index b0f2df3fe..4fc6da152 100644 --- a/roles/1-prep/tasks/main.yml +++ b/roles/1-prep/tasks/main.yml @@ -43,6 +43,12 @@ # has no "when: XXXXX_install" flag tags: base, sshd +- name: IIAB-ADMIN + include_role: + name: iiab-admin + # has no "when: XXXXX_install" flag + tags: base, iiab-admin + - name: OPENVPN include_role: name: openvpn From adce6beaf198a70a9e31e1e93cb2a90dc4f72316 Mon Sep 17 00:00:00 2001 From: A Holt <holta@users.noreply.github.com> Date: Thu, 20 Sep 2018 05:57:07 -0400 Subject: [PATCH 11/25] Update iiab-support.yml --- iiab-support.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-support.yml b/iiab-support.yml index 22b48df3c..170d0cf24 100644 --- a/iiab-support.yml +++ b/iiab-support.yml @@ -11,4 +11,4 @@ - { role: 0-init, tags: ['0-init'] } #- { role: 1-prep, tags: ['1-prep', 'platform', 'base'] } - { role: 1-prep, tags: ['1-prep'] } - - { role: openvpn, tags: ['openvpn'] } + #- { role: openvpn, tags: ['openvpn'] } # no longer nec, as 1-prep calls role openvpn (2018-09-19) From 7b12c2051f5dab1dcfd9fd80d8ca8b9781e8260f Mon Sep 17 00:00:00 2001 From: A Holt <holta@users.noreply.github.com> Date: Thu, 20 Sep 2018 10:22:38 -0400 Subject: [PATCH 12/25] Update default_vars.yml --- vars/default_vars.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 593ccd6d9..6e98b7e5d 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -415,11 +415,14 @@ calibreweb_port: 8083 calibreweb_url: /books calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web - +12345678901234567890123456789012345678901234567890123456789012345678901234567890 # PLEASE CONSIDER THESE 2 NEW OPENSTREETMAP APPROACHES INSTEAD, AS OF 2018: # - http://download.iiab.io/content/OSM/vector-tiles/ # - http://oer2go.org/viewmod/en-worldmap-10 # +# DOWNLOAD EITHER OSM MANUALLY, OR BETTER YET TRY IIAB'S ADMIN CONSOLE: +# http://box/admin -> Install Content -> Get OER2GO(RACHEL) Modules +# # OpenStreetMap (OSM) legacy - unmaintained: # osm_install: False # osm_enabled: False From c9a3f74e2ff3f1b36a8c80b19f6ba8a194e6bf19 Mon Sep 17 00:00:00 2001 From: A Holt <holta@users.noreply.github.com> Date: Thu, 20 Sep 2018 10:22:42 -0400 Subject: [PATCH 13/25] Update local_vars_min.yml --- vars/local_vars_min.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 81ebfd0be..8c933ee93 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -254,6 +254,9 @@ calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web # - http://download.iiab.io/content/OSM/vector-tiles/ # - http://oer2go.org/viewmod/en-worldmap-10 # +# DOWNLOAD EITHER OSM MANUALLY, OR BETTER YET TRY IIAB'S ADMIN CONSOLE: +# http://box/admin -> Install Content -> Get OER2GO(RACHEL) Modules +# # Unmaintained - OpenStreetMap (OSM) legacy # osm_install: False # osm_enabled: False From 966a7b99ea54422df85a3c9b02e349b9bd73b54a Mon Sep 17 00:00:00 2001 From: A Holt <holta@users.noreply.github.com> Date: Thu, 20 Sep 2018 10:22:50 -0400 Subject: [PATCH 14/25] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 92893d08e..24c1571b4 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -254,6 +254,9 @@ calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web # - http://download.iiab.io/content/OSM/vector-tiles/ # - http://oer2go.org/viewmod/en-worldmap-10 # +# DOWNLOAD EITHER OSM MANUALLY, OR BETTER YET TRY IIAB'S ADMIN CONSOLE: +# http://box/admin -> Install Content -> Get OER2GO(RACHEL) Modules +# # Unmaintained - OpenStreetMap (OSM) legacy # osm_install: False # osm_enabled: False From 2fcf349ad3129074b6ff48ddeb02131f42d7b399 Mon Sep 17 00:00:00 2001 From: A Holt <holta@users.noreply.github.com> Date: Thu, 20 Sep 2018 10:22:55 -0400 Subject: [PATCH 15/25] Update local_vars_big.yml --- vars/local_vars_big.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 1247b9351..e6ab61b54 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -254,6 +254,9 @@ calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web # - http://download.iiab.io/content/OSM/vector-tiles/ # - http://oer2go.org/viewmod/en-worldmap-10 # +# DOWNLOAD EITHER OSM MANUALLY, OR BETTER YET TRY IIAB'S ADMIN CONSOLE: +# http://box/admin -> Install Content -> Get OER2GO(RACHEL) Modules +# # Unmaintained - OpenStreetMap (OSM) legacy # osm_install: False # osm_enabled: False From e7ecf8660cedbb313f0292308f6eba928e88cea2 Mon Sep 17 00:00:00 2001 From: A Holt <holta@users.noreply.github.com> Date: Thu, 20 Sep 2018 10:24:23 -0400 Subject: [PATCH 16/25] Update default_vars.yml --- vars/default_vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 6e98b7e5d..b0317638c 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -415,7 +415,7 @@ calibreweb_port: 8083 calibreweb_url: /books calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web -12345678901234567890123456789012345678901234567890123456789012345678901234567890 + # PLEASE CONSIDER THESE 2 NEW OPENSTREETMAP APPROACHES INSTEAD, AS OF 2018: # - http://download.iiab.io/content/OSM/vector-tiles/ # - http://oer2go.org/viewmod/en-worldmap-10 From 7320ac82b308ca6b0239cd89ff13ac7b553bbf6b Mon Sep 17 00:00:00 2001 From: A Holt <holta@users.noreply.github.com> Date: Thu, 20 Sep 2018 18:27:53 -0400 Subject: [PATCH 17/25] 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 <holta@users.noreply.github.com> Date: Thu, 20 Sep 2018 18:30:50 -0400 Subject: [PATCH 18/25] 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 <holta@users.noreply.github.com> Date: Thu, 20 Sep 2018 18:35:36 -0400 Subject: [PATCH 19/25] 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 <holta@users.noreply.github.com> Date: Thu, 20 Sep 2018 18:46:45 -0400 Subject: [PATCH 20/25] 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 <holta@users.noreply.github.com> Date: Thu, 20 Sep 2018 18:49:36 -0400 Subject: [PATCH 21/25] 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 <holta@users.noreply.github.com> Date: Thu, 20 Sep 2018 19:01:11 -0400 Subject: [PATCH 22/25] 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 <holta@users.noreply.github.com> Date: Thu, 20 Sep 2018 19:05:56 -0400 Subject: [PATCH 23/25] 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 <holta@users.noreply.github.com> Date: Thu, 20 Sep 2018 19:15:56 -0400 Subject: [PATCH 24/25] 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 <holta@users.noreply.github.com> Date: Thu, 20 Sep 2018 19:23:04 -0400 Subject: [PATCH 25/25] 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 }}