From 079e5e04e0798f5950fdb5c0ef2663345d88ce8f Mon Sep 17 00:00:00 2001 From: root Date: Tue, 6 Jul 2021 16:25:13 -0400 Subject: [PATCH 1/2] MediaWiki + Sugarizer + WordPress w/o Apache --- .../mediawiki/tasks/{apache.yml => apache.yml.unused} | 0 roles/mediawiki/tasks/install.yml | 6 ------ roles/mediawiki/tasks/main.yml | 7 +------ .../{mediawiki.conf.j2 => mediawiki.conf.j2.unused} | 0 roles/sugarizer/tasks/enable-or-disable.yml | 2 +- roles/sugarizer/tasks/install.yml | 7 ------- roles/sugarizer/tasks/main2.yml | 3 ++- roles/sugarizer/templates/sugarizer-nginx.conf | 9 --------- roles/sugarizer/templates/sugarizer-nginx.conf.j2 | 10 ++++++++++ ...zer.conf.j2.deprecated => sugarizer.conf.j2.unused} | 0 .../wordpress/tasks/{apache.yml => apache.yml.unused} | 0 roles/wordpress/tasks/install.yml | 6 ------ roles/wordpress/tasks/main.yml | 7 +------ .../{wordpress.conf.j2 => wordpress.conf.j2.unused} | 0 14 files changed, 15 insertions(+), 42 deletions(-) rename roles/mediawiki/tasks/{apache.yml => apache.yml.unused} (100%) rename roles/mediawiki/templates/{mediawiki.conf.j2 => mediawiki.conf.j2.unused} (100%) delete mode 100644 roles/sugarizer/templates/sugarizer-nginx.conf create mode 100644 roles/sugarizer/templates/sugarizer-nginx.conf.j2 rename roles/sugarizer/templates/{sugarizer.conf.j2.deprecated => sugarizer.conf.j2.unused} (100%) rename roles/wordpress/tasks/{apache.yml => apache.yml.unused} (100%) rename roles/wordpress/templates/{wordpress.conf.j2 => wordpress.conf.j2.unused} (100%) diff --git a/roles/mediawiki/tasks/apache.yml b/roles/mediawiki/tasks/apache.yml.unused similarity index 100% rename from roles/mediawiki/tasks/apache.yml rename to roles/mediawiki/tasks/apache.yml.unused diff --git a/roles/mediawiki/tasks/install.yml b/roles/mediawiki/tasks/install.yml index 47edf6429..a5d11b86c 100644 --- a/roles/mediawiki/tasks/install.yml +++ b/roles/mediawiki/tasks/install.yml @@ -93,12 +93,6 @@ regexp: '^\$wgServer =' line: '$wgServer = "//" . $_SERVER["HTTP_HOST"];' -- name: 'Install from template: /etc/{{ apache_conf_dir }}/mediawiki.conf -- for http://box{{ mediawiki_url }}' - template: - src: mediawiki.conf.j2 - dest: "/etc/{{ apache_conf_dir }}/mediawiki.conf" # apache2/sites-available - when: apache_installed is defined - # RECORD MediaWiki AS INSTALLED diff --git a/roles/mediawiki/tasks/main.yml b/roles/mediawiki/tasks/main.yml index c3f2d66d2..2318a886d 100644 --- a/roles/mediawiki/tasks/main.yml +++ b/roles/mediawiki/tasks/main.yml @@ -24,13 +24,8 @@ when: mediawiki_installed is undefined -- name: Enable/Disable/Restart Apache if primary - include_tasks: apache.yml - when: not nginx_enabled - -- name: Enable/Disable/Restart NGINX if primary +- name: Enable/Disable/Restart NGINX include_tasks: nginx.yml - when: nginx_enabled - name: Add 'mediawiki' variable values to {{ iiab_ini_file }} diff --git a/roles/mediawiki/templates/mediawiki.conf.j2 b/roles/mediawiki/templates/mediawiki.conf.j2.unused similarity index 100% rename from roles/mediawiki/templates/mediawiki.conf.j2 rename to roles/mediawiki/templates/mediawiki.conf.j2.unused diff --git a/roles/sugarizer/tasks/enable-or-disable.yml b/roles/sugarizer/tasks/enable-or-disable.yml index f3fda427c..8abccd61b 100644 --- a/roles/sugarizer/tasks/enable-or-disable.yml +++ b/roles/sugarizer/tasks/enable-or-disable.yml @@ -15,7 +15,7 @@ - name: Enable http://box/sugarizer if sugarizer_enabled, by installing {{ nginx_conf_dir }}/sugarizer-nginx.conf from template template: - src: sugarizer-nginx.conf + src: sugarizer-nginx.conf.j2 dest: "{{ nginx_conf_dir }}/sugarizer-nginx.conf" # /etc/nginx/conf.d when: sugarizer_enabled diff --git a/roles/sugarizer/tasks/install.yml b/roles/sugarizer/tasks/install.yml index 275780063..30c51f2ac 100644 --- a/roles/sugarizer/tasks/install.yml +++ b/roles/sugarizer/tasks/install.yml @@ -158,13 +158,6 @@ systemd: daemon_reload: yes -# 2020-10-30: PR #2604 tries a cleaner layout, with NGINX only -#- name: "Install from template: /etc/{{ apache_conf_dir }}/sugarizer.conf" -# template: -# src: sugarizer.conf.j2 -# dest: "/etc/{{ apache_conf_dir }}/sugarizer.conf" # apache2/sites-available -# when: apache_installed is defined - # 3 [WAS 4] STANZAS ADDED BELOW JAN/FEB 2019, HOPING THIS MIGHT "JUST WORK" # WITH FUTURE UPGRADES BEYOND SUGARIZER 1.1?! # diff --git a/roles/sugarizer/tasks/main2.yml b/roles/sugarizer/tasks/main2.yml index 5a719e233..88aa786f8 100644 --- a/roles/sugarizer/tasks/main2.yml +++ b/roles/sugarizer/tasks/main2.yml @@ -3,7 +3,8 @@ when: sugarizer_installed is undefined -- include_tasks: enable-or-disable.yml +- name: Enable/Disable/Restart NGINX + include_tasks: enable-or-disable.yml - name: Add 'sugarizer' variable values to {{ iiab_ini_file }} diff --git a/roles/sugarizer/templates/sugarizer-nginx.conf b/roles/sugarizer/templates/sugarizer-nginx.conf deleted file mode 100644 index 0085217dd..000000000 --- a/roles/sugarizer/templates/sugarizer-nginx.conf +++ /dev/null @@ -1,9 +0,0 @@ -# sugarizer_port is set to 8089 in /opt/iiab/iiab/vars/default_vars.yml -# If you need to change this, edit /etc/iiab/local_vars.yml prior to installing -location /sugarizer { - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Scheme $scheme; - proxy_set_header X-Script-Name /sugarizer; - proxy_pass http://127.0.0.1:8089; -} diff --git a/roles/sugarizer/templates/sugarizer-nginx.conf.j2 b/roles/sugarizer/templates/sugarizer-nginx.conf.j2 new file mode 100644 index 000000000..29fb7a212 --- /dev/null +++ b/roles/sugarizer/templates/sugarizer-nginx.conf.j2 @@ -0,0 +1,10 @@ +# sugarizer_port is set to 8089 in /opt/iiab/iiab/vars/default_vars.yml +# If you need to change this, edit /etc/iiab/local_vars.yml prior to installing + +location /sugarizer { + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Scheme $scheme; + proxy_set_header X-Script-Name /sugarizer; + proxy_pass http://127.0.0.1:{{ sugarizer_port }}; +} diff --git a/roles/sugarizer/templates/sugarizer.conf.j2.deprecated b/roles/sugarizer/templates/sugarizer.conf.j2.unused similarity index 100% rename from roles/sugarizer/templates/sugarizer.conf.j2.deprecated rename to roles/sugarizer/templates/sugarizer.conf.j2.unused diff --git a/roles/wordpress/tasks/apache.yml b/roles/wordpress/tasks/apache.yml.unused similarity index 100% rename from roles/wordpress/tasks/apache.yml rename to roles/wordpress/tasks/apache.yml.unused diff --git a/roles/wordpress/tasks/install.yml b/roles/wordpress/tasks/install.yml index 2ac843cff..a5713f923 100644 --- a/roles/wordpress/tasks/install.yml +++ b/roles/wordpress/tasks/install.yml @@ -112,12 +112,6 @@ group: "{{ apache_user }}" # DO WE REALLY STILL WANT THIS FOR NGINX? mode: '0660' # Others strongly recommend '0600' (or do PHP/Apache/NGINX really need group read & write permissions?) -- name: Install /etc/{{ apache_conf_dir }}/wordpress.conf from template, for http://box{{ wp_url }} via Apache - template: - src: wordpress.conf.j2 - dest: "/etc/{{ apache_conf_dir }}/wordpress.conf" - when: apache_installed is defined - # RECORD WordPress AS INSTALLED diff --git a/roles/wordpress/tasks/main.yml b/roles/wordpress/tasks/main.yml index f3b973f33..7204f741e 100644 --- a/roles/wordpress/tasks/main.yml +++ b/roles/wordpress/tasks/main.yml @@ -30,13 +30,8 @@ when: wordpress_installed is undefined -- name: Enable/Disable/Restart Apache if primary - include_tasks: apache.yml - when: not nginx_enabled - -- name: Enable/Disable/Restart NGINX if primary +- name: Enable/Disable/Restart NGINX include_tasks: nginx.yml - when: nginx_enabled - name: Add 'wordpress' variable values to {{ iiab_ini_file }} diff --git a/roles/wordpress/templates/wordpress.conf.j2 b/roles/wordpress/templates/wordpress.conf.j2.unused similarity index 100% rename from roles/wordpress/templates/wordpress.conf.j2 rename to roles/wordpress/templates/wordpress.conf.j2.unused From 5c2c558953651c05548411a09810a4db85fd354d Mon Sep 17 00:00:00 2001 From: root Date: Tue, 6 Jul 2021 16:32:26 -0400 Subject: [PATCH 2/2] roles/nginx/README.md: MediaWiki + Sugarizer + WordPress --- roles/nginx/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/nginx/README.md b/roles/nginx/README.md index df3e7e97d..8f463c362 100644 --- a/roles/nginx/README.md +++ b/roles/nginx/README.md @@ -20,12 +20,15 @@ * jupyterhub * kolibri * lokole + * mediawiki * moodle * nextcloud * nodered * OER2Go/RACHEL modules * osm-vector-maps + * sugarizer * usb_lib + * wordpress 2. These support "Native" NGINX ***AND*** Apache, a.k.a. "dual support" for legacy testing (if suitable "Shims" from *Section iii.* below are preserved!) Both "Native" NGINX and "Shim" proxying from NGINX to Apache port 8090 *cannot be enabled simultaneously* for these IIAB Apps/Service: @@ -33,10 +36,7 @@ * calibre-web * gitea * kiwix - * mediawiki * munin - * sugarizer - * wordpress 3. These support Apache but ***NOT*** "Native" NGINX. They use a "Shim" to [proxy_pass](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) from NGINX to Apache on port 8090. See [roles/3-base-server/tasks/main.yml#L11](../3-base-server/tasks/main.yml#L11) for a list of ~6 IIAB Apps/Services that auto-enable Apache.