Merge pull request #332 from iiab/master

sync from iiab:master

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

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
 
@@ -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

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 | bool

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: 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))

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
@@ -11,3 +11,4 @@
 - name: Enable WordPress
   include_tasks: enable.yml
   when: wordpress_install or wordpress_installed is defined
+  # when: wordpress_enabled | bool

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
+- name: Create MySQL username ({{ wp_db_user }}) with password, for WordPress database
   mysql_user:
     name: "{{ wp_db_user }}"
     password: "{{ wp_db_user_password }}"