Merge pull request #298 from iiab/master

sync from iiab/iiab

roles/activity-server/tasks/main.yml

@@ -77,6 +77,7 @@
             group=root
             mode=0644
 
+# SEE ALSO THE apache2_module SECTION IN roles/httpd/tasks/main.yml
 - name: enable mod_expires for debian
   command: a2enmod expires
   when: is_debuntu | bool

roles/awstats/tasks/install.yml

@@ -18,6 +18,7 @@
   tags:
     - download
 
+# SEE ALSO THE apache2_module SECTION IN roles/httpd/tasks/main.yml
 - name: Enable cgi execution (debuntu)
   command: a2enmod cgi
   when: is_debuntu | bool

roles/gitea/defaults/main.yml

@@ -8,7 +8,7 @@
 # https://git.coolaj86.com/coolaj86/gitea-installer.sh
 
 # Information needed to install Gitea
-gitea_version: 1.9.3
+gitea_version: 1.9.4
 iset_suffixes:
   i386: 386
   x86_64: amd64

roles/httpd/tasks/main.yml

@@ -103,12 +103,27 @@
     - mpm_prefork.load
   when: is_debuntu | bool
 
-- name: 'Turn on mod_proxy using a2enmod with: proxy, proxy_html, headers, rewrite (debuntu)'
-  command: a2enmod {{ item }}
+#- name: 'Turn on mod_proxy using a2enmod with: proxy, proxy_html, headers, rewrite (debuntu)'
+#  command: a2enmod {{ item }}
+#  with_items:
+#    - proxy
+#    - proxy_html
+#    - headers
+#    - rewrite
+#  when: is_debuntu | bool
+#
+# NOTE: activity-server/tasks/main.yml runs "a2enmod expires"
+# NOTE: awstats/tasks/install.yml      runs "a2enmod cgi"
+# NOTE: nodered/tasks/main.yml uses apache2_module to install "proxy_wstunnel"
+# 2019-10-07: proxy_http is definitely essential!  (ARE THE OTHER 4 BELOW REALLY NEEDED ?)
+- name: 'Enable 5 Apache modules, as with "a2enmod" command: headers, proxy, proxy_html, proxy_http, rewrite (for http://box/kiwix, http://box/kolibri, http://box/nodered, etc--if debuntu)'
+  apache2_module:
+    name: "{{ item }}"
   with_items:
+    - headers
     - proxy
     - proxy_html
-    - headers
+    - proxy_http
     - rewrite
   when: is_debuntu | bool
 

roles/internetarchive/README.md

@@ -1,7 +1,7 @@
-# Internet Archive Universal Library / Decentralized Web README
+# Internet Archive Offline / Universal Library / Decentralized Web README
 
 The Internet Archive (http://archive.org) is famous for their WayBack Machine
-that has saved 362+ Billion web pages, and more recently their Decentralized
+that has saved 384+ Billion web pages, and more recently their Decentralized
 Web project.
 
 This Ansible role installs the Internet Archive's dweb-mirror project on

roles/kiwix/tasks/kiwix_install.yml

@@ -71,16 +71,17 @@
 
 # 3. ENABLE MODS FOR APACHE PROXY IF DEBUNTU
 
+# 2019-10-07: Moved to roles/httpd/tasks/main.yml
 # 2019-09-29: Compare roles/kolibri/defaults/main.yml using just 1 (proxy_http)
-- name: Enable the 4 mods which permit Apache to proxy (debuntu)
-  apache2_module:
-    name: "{{ item }}"
-  with_items:
-    - proxy
-    - proxy_html
-    - proxy_http
-    - rewrite
-  when: is_debuntu | bool
+#- name: Enable the 4 mods which permit Apache to proxy (debuntu)
+#  apache2_module:
+#    name: "{{ item }}"
+#  with_items:
+#    - proxy
+#    - proxy_html
+#    - proxy_http
+#    - rewrite
+#  when: is_debuntu | bool
 
 # 4. CREATE/ENABLE/RESTART (OR DISABLE) KIWIX SERVICE & ITS CRON JOB
 

roles/kolibri/tasks/main.yml

@@ -105,11 +105,12 @@
   when: kolibri_provision | bool
 
 
+# 2019-10-07: Moved to roles/httpd/tasks/main.yml
 # 2019-09-29: roles/kiwix/tasks/kiwix_install.yml installs 4 Apache modules
 # for similar purposes (not all nec?)  Only 1 (proxy_http) is needed here.
-- name: Enable Apache module proxy_http for http://box{{ kolibri_url }}    # i.e. http://box/kolibri
-  apache2_module:
-    name: proxy_http
+#- name: Enable Apache module proxy_http for http://box{{ kolibri_url }}    # i.e. http://box/kolibri
+#  apache2_module:
+#    name: proxy_http
 
 - name: Start 'kolibri' systemd service, if kolibri_enabled
   systemd:

roles/mediawiki/defaults/main.yml

@@ -5,7 +5,7 @@
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
 
 mediawiki_major_version: "1.33"
-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 }}"

roles/nodered/tasks/main.yml

@@ -186,6 +186,7 @@
     state: absent
   when: not nodered_enabled
 
+# SEE ALSO THE apache2_module SECTION IN roles/httpd/tasks/main.yml
 - name: Enable proxy_wstunnel apache2 module
   apache2_module:
     state: present