Merge pull request #2132 from holta/quick-doc-fixes

Quick doc fixes: MediaWiki, NGINX, WordPress

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

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

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