From 3c361728dd5e88c7692c51903605f8539e00928b Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 12 Jan 2020 00:17:54 -0500 Subject: [PATCH 01/12] Cleaner wordpress/tasks/setup.yml --- roles/wordpress/tasks/setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/wordpress/tasks/setup.yml b/roles/wordpress/tasks/setup.yml index 1f0c8a5a9..255d7bc74 100644 --- a/roles/wordpress/tasks/setup.yml +++ b/roles/wordpress/tasks/setup.yml @@ -8,7 +8,7 @@ name: "{{ wp_db_name }}" state: present -- name: Create MySQL wordpress database user +- name: Create MySQL wordpress database user {{ wp_db_user }} with password mysql_user: name: "{{ wp_db_user }}" password: "{{ wp_db_user_password }}" From 2d57c05d33caaa25a8d2a2ed308d610e14f7dd35 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 12 Jan 2020 00:47:46 -0500 Subject: [PATCH 02/12] wordpress/tasks/main.yml conditions need clarity --- roles/wordpress/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/wordpress/tasks/main.yml b/roles/wordpress/tasks/main.yml index 0e1555e01..54dc356cc 100644 --- a/roles/wordpress/tasks/main.yml +++ b/roles/wordpress/tasks/main.yml @@ -1,8 +1,8 @@ # SEE "emergency" REINSTALL INSTRUCTIONS IN roles/wordpress/tasks/install.yml -- name: Provision MySql DB for WordPress +- name: Provision MySQL DB for WordPress include_tasks: setup.yml - when: wordpress_install | bool and not installing | bool + when: wordpress_install and not installing - name: Install WordPress if wordpress_installed is absent include_tasks: install.yml From ce646a734af170a6bf8ce2447a9f3cc0946e7b5b Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 12 Jan 2020 01:10:24 -0500 Subject: [PATCH 03/12] wordpress/tasks/setup.yml readability --- roles/wordpress/tasks/setup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/wordpress/tasks/setup.yml b/roles/wordpress/tasks/setup.yml index 255d7bc74..e9dd88e00 100644 --- a/roles/wordpress/tasks/setup.yml +++ b/roles/wordpress/tasks/setup.yml @@ -3,12 +3,12 @@ state: started name: "{{ mysql_service }}" -- name: 'Create MySQL wordpress database: {{ wp_db_name }}' +- name: 'Create MySQL database for WordPress: {{ wp_db_name }}' mysql_db: name: "{{ wp_db_name }}" state: present -- name: Create MySQL wordpress database user {{ wp_db_user }} with password +- name: Create MySQL username ({{ wp_db_user }}) with password, for WordPress database mysql_user: name: "{{ wp_db_user }}" password: "{{ wp_db_user_password }}" From 622ee1fe61ca46a713824059ee99e660f602b4fd Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 12 Jan 2020 01:28:03 -0500 Subject: [PATCH 04/12] roles/nginx/README.md --- roles/nginx/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nginx/README.md b/roles/nginx/README.md index 08bbd8878..b85f4a1cb 100644 --- a/roles/nginx/README.md +++ b/roles/nginx/README.md @@ -17,7 +17,7 @@ * kiwix -- goes directly to port 3000 * kolibri * sugarizer - 3. Still proxied to Apache, see: https://github.com/iiab/iiab/blob/master/roles/nginx/tasks/uses_apache.yml + 3. Still proxied to Apache, see: PR [#2131](https://github.com/iiab/iiab/pull/2131) & https://github.com/iiab/iiab/blob/master/roles/nginx/tasks/uses_apache.yml * dokuwiki ([#2056](https://github.com/iiab/iiab/issues/2056)) * elgg * lokole From 62458cc1e97dcb55bc92ff679cc1334bc348c972 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 12 Jan 2020 01:29:10 -0500 Subject: [PATCH 05/12] http://box/wiki fix in mediawiki/defaults/main.yml --- 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 cf6f155d1..64ac1880d 100644 --- a/roles/mediawiki/defaults/main.yml +++ b/roles/mediawiki/defaults/main.yml @@ -17,7 +17,7 @@ mediawiki_db_user_password: changeme mediawiki_admin_user: Admin mediawiki_admin_user_password: changeme -# http://box/mediawiki will ask you for a stronger password on login, per: +# http://box/wiki will ask you for a stronger password on login, per: # https://www.mediawiki.org/wiki/Wikimedia_Security_Team/Password_strengthening_2019#Password_requirements mediawiki_site_name: Community Wiki From 5f4f66054e53c5748e05b8a76b95fcff90ea287b Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 12 Jan 2020 01:32:43 -0500 Subject: [PATCH 06/12] http://box/wiki fix in mediawiki/tasks/enable.yml --- roles/mediawiki/tasks/enable.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/mediawiki/tasks/enable.yml b/roles/mediawiki/tasks/enable.yml index 4d20df853..0816b5107 100644 --- a/roles/mediawiki/tasks/enable.yml +++ b/roles/mediawiki/tasks/enable.yml @@ -1,6 +1,6 @@ # Apache -- name: Enable http://box{{ mediawiki_url }} via Apache # i.e. http://box/mediawiki +- name: Enable http://box{{ mediawiki_url }} via Apache # i.e. http://box/wiki command: a2ensite mediawiki.conf when: apache_install and mediawiki_enabled From 6bfcf9da52fef04e3a281c52ab4f76fabe515140 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 12 Jan 2020 01:35:22 -0500 Subject: [PATCH 07/12] Initial cleanup of mediawiki/tasks/main.yml --- roles/mediawiki/tasks/main.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/roles/mediawiki/tasks/main.yml b/roles/mediawiki/tasks/main.yml index ee96ee73b..8e2d8999e 100644 --- a/roles/mediawiki/tasks/main.yml +++ b/roles/mediawiki/tasks/main.yml @@ -1,7 +1,8 @@ -- name: Install MediaWiki {{ mediawiki_version }} if mediawiki_install +- name: Install MediaWiki {{ mediawiki_version }} include_tasks: install.yml - when: mediawiki_install | bool and not mediawiki_installed is defined + when: mediawiki_install and not mediawiki_installed is defined -- name: Install MediaWiki {{ mediawiki_version }} if mediawiki_install +- name: Enable MediaWiki include_tasks: enable.yml - when: mediawiki_install | bool or mediawiki_installed is defined + when: mediawiki_install or mediawiki_installed is defined + # when: mediawiki_enabled From 416869689ba701425150c8a29971969f473260d9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 12 Jan 2020 01:37:14 -0500 Subject: [PATCH 08/12] Towards wordpress/tasks/main.yml clarity+legibility --- roles/wordpress/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/wordpress/tasks/main.yml b/roles/wordpress/tasks/main.yml index 0e1555e01..4487c1954 100644 --- a/roles/wordpress/tasks/main.yml +++ b/roles/wordpress/tasks/main.yml @@ -11,3 +11,4 @@ - name: Enable WordPress include_tasks: enable.yml when: wordpress_install or wordpress_installed is defined + # when: wordpress_enabled From 2c153349baecf0c26180c14812e8989cce8e9974 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 12 Jan 2020 01:39:17 -0500 Subject: [PATCH 09/12] Update main.yml --- roles/wordpress/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/wordpress/tasks/main.yml b/roles/wordpress/tasks/main.yml index 4487c1954..929f1757c 100644 --- a/roles/wordpress/tasks/main.yml +++ b/roles/wordpress/tasks/main.yml @@ -11,4 +11,4 @@ - name: Enable WordPress include_tasks: enable.yml when: wordpress_install or wordpress_installed is defined - # when: wordpress_enabled + # when: wordpress_enabled | bool From 81986086ec5a5cac959acdd7fa0a1ef13fe78be6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 12 Jan 2020 01:40:02 -0500 Subject: [PATCH 10/12] Update enable.yml --- roles/mediawiki/tasks/enable.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/mediawiki/tasks/enable.yml b/roles/mediawiki/tasks/enable.yml index 0816b5107..888a0600d 100644 --- a/roles/mediawiki/tasks/enable.yml +++ b/roles/mediawiki/tasks/enable.yml @@ -14,7 +14,6 @@ state: restarted when: apache_enabled | bool - # NGINX - name: Enable http://box{{ mediawiki_url }} via NGINX, by installing {{ nginx_config_dir }}/mediawiki-nginx.conf from template From 52bce6f8462c4a578e01bce46fedb1f8ed54fa75 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 12 Jan 2020 01:40:21 -0500 Subject: [PATCH 11/12] 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 8e2d8999e..d3565e63d 100644 --- a/roles/mediawiki/tasks/main.yml +++ b/roles/mediawiki/tasks/main.yml @@ -5,4 +5,4 @@ - name: Enable MediaWiki include_tasks: enable.yml when: mediawiki_install or mediawiki_installed is defined - # when: mediawiki_enabled + # when: mediawiki_enabled | bool From 320e541f708be7132c90356f4fc169cd9dc54fa4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 12 Jan 2020 01:57:00 -0500 Subject: [PATCH 12/12] Doc tweaks @ roles/nginx/README.md --- roles/nginx/README.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/roles/nginx/README.md b/roles/nginx/README.md index b85f4a1cb..e49e46418 100644 --- a/roles/nginx/README.md +++ b/roles/nginx/README.md @@ -1,8 +1,11 @@ ### Transition to NGINX -1. Initial testing strategy is to move nginx to port 80, and proxy everything to Apache on port 8090 -- creating a shim. +1. Initial testing strategy is to move NGINX to port 80, and proxy everything to Apache on port 8090 -- creating a shim. + 2. Without PHP available via FastCGI, any function at all for PHP-based applications validates NGINX. -3. Current state (2020-01-11) + +3. Current state (2020-01-12). + 1. Principal functions migrated to NGINX * Admin Console * kalite -- goes directly to port 8009 @@ -10,19 +13,22 @@ * osm-vector-maps * usb-lib * wordpress - 2. Dual support, see: https://github.com/iiab/iiab/blob/master/roles/nginx/tasks/only_nginx.yml + + 2. Dual support, see https://github.com/iiab/iiab/blob/master/roles/nginx/tasks/only_nginx.yml * awstats ([#2124](https://github.com/iiab/iiab/issues/2124)) * calibre-web * gitea * kiwix -- goes directly to port 3000 * kolibri * sugarizer - 3. Still proxied to Apache, see: PR [#2131](https://github.com/iiab/iiab/pull/2131) & https://github.com/iiab/iiab/blob/master/roles/nginx/tasks/uses_apache.yml + + 3. Still proxied to Apache, see [PR #2131](https://github.com/iiab/iiab/pull/2131) & https://github.com/iiab/iiab/blob/master/roles/nginx/tasks/uses_apache.yml * dokuwiki ([#2056](https://github.com/iiab/iiab/issues/2056)) * elgg * lokole * moodle * nodered * nextcloud ([PR #2119](https://github.com/iiab/iiab/pull/2119)) + 4. Not yet dealt with - * internetarchive ([#2120](https://github.com/iiab/iiab/pull/2120)) + * internetarchive ([PR #2120](https://github.com/iiab/iiab/pull/2120))