WIP: Extricate IIAB from 2 web servers complexity

roles/nginx/tasks/enable-or-disable.yml

@@ -1,29 +1,29 @@
-- name: Ensure that Apache ({{ apache_service }}) is not running -- we may need port swap
-  systemd:
-    name: "{{ apache_service }}"    # apache2 or httpd, per /opt/iiab/iiab/vars/<OS>.yml
-    state: stopped
-  ignore_errors: yes
-  # 'when: apache_installed is defined' might also work, as mysql's php no longer installs apache2 (but 'ignore_errors: yes' remains safer!)
+# - name: Ensure that Apache ({{ apache_service }}) is not running -- we may need port swap
+#   systemd:
+#     name: "{{ apache_service }}"    # apache2 or httpd, per /opt/iiab/iiab/vars/<OS>.yml
+#     state: stopped
+#   ignore_errors: yes
+#   # 'when: apache_installed is defined' might also work, as mysql's php no longer installs apache2 (but 'ignore_errors: yes' remains safer!)
 
-- name: Install /etc/{{ apache_service }}/ports.conf from template 1 of 2 (ports.conf.j2) if nginx_enabled, to enable Apache port {{ apache_port }} localhost only
-  template:
-    src: ports.conf.j2
-    dest: "/etc/{{ apache_service }}/ports.conf"
-  when: nginx_enabled
+# - name: Install /etc/{{ apache_service }}/ports.conf from template 1 of 2 (ports.conf.j2) if nginx_enabled, to enable Apache port {{ apache_port }} localhost only
+#   template:
+#     src: ports.conf.j2
+#     dest: "/etc/{{ apache_service }}/ports.conf"
+#   when: nginx_enabled
 
-- name: Install /etc/{{ apache_service }}/ports.conf from template 2 of 2 (stock-apache-ports.conf) if not nginx_enabled, to disable Apache port {{ apache_port }} localhost only
-  template:
-    src: stock-apache-ports.conf
-    dest: "/etc/{{ apache_service }}/ports.conf"
-  when: not nginx_enabled
+# - name: Install /etc/{{ apache_service }}/ports.conf from template 2 of 2 (stock-apache-ports.conf) if not nginx_enabled, to disable Apache port {{ apache_port }} localhost only
+#   template:
+#     src: stock-apache-ports.conf
+#     dest: "/etc/{{ apache_service }}/ports.conf"
+#   when: not nginx_enabled
 
-- name: Enable & Restart '{{ apache_service }}' if Apache is installed and enabled, since we stopped it
-  systemd:
-    name: "{{ apache_service }}"    # apache2 or httpd, per /opt/iiab/iiab/vars/<OS>.yml
-    daemon_reload: yes
-    state: restarted
-    enabled: true
-  when: apache_installed is defined and apache_enabled    # or not nginx_enabled
+# - name: Enable & Restart '{{ apache_service }}' if Apache is installed and enabled, since we stopped it
+#   systemd:
+#     name: "{{ apache_service }}"    # apache2 or httpd, per /opt/iiab/iiab/vars/<OS>.yml
+#     daemon_reload: yes
+#     state: restarted
+#     enabled: true
+#   when: apache_installed is defined and apache_enabled    # or not nginx_enabled
 
 
 - name: Enable & (Re)Start 'nginx' systemd service, if nginx_enabled

roles/nginx/tasks/install.yml

@@ -1,16 +1,16 @@
-- name: Stop '{{ apache_service }}' systemd service
-  systemd:
-    name: "{{ apache_service }}"    # apache2 or httpd, per /opt/iiab/iiab/vars/<OS>.yml
-    state: stopped
-  ignore_errors: yes
-  # 'when: apache_installed is defined' insuff b/c mysql's php installs apache2
+# - name: Stop '{{ apache_service }}' systemd service
+#   systemd:
+#     name: "{{ apache_service }}"    # apache2 or httpd, per /opt/iiab/iiab/vars/<OS>.yml
+#     state: stopped
+#   ignore_errors: yes
+#   # 'when: apache_installed is defined' insuff b/c mysql's php installs apache2
 
 - name: 'Install 5 packages for NGINX: libnginx-mod-http-subs-filter, nginx-extras, php{{ php_version }}-fpm, uwsgi, uwsgi-plugin-python3'
   package:
     name:
       - libnginx-mod-http-subs-filter
       - nginx-extras
-      - php{{ php_version }}-fpm    # Drags in [1] php{{ php_version }}-cli (superset of php{{ php_version }}-common) [2] libsodium23 (likewise installed in moodle/tasks/install.yml AND wordpress/tasks/install.yml) [3] php{{ php_version }}-json if PHP < 8.0 (NEEDED FOR nextcloud/tasks/install.yml AND pbx/tasks/freepbx_dependencies.yml AND wordpress/tasks/install.yml)
+      - php{{ php_version }}-fpm    # INSTALLS [0] /etc/apache2/conf-available/php{{ php_version }}-fpm.conf AND DRAGS IN [1] php{{ php_version }}-cli (superset of php{{ php_version }}-common) [2] libsodium23 (likewise installed in moodle/tasks/install.yml AND wordpress/tasks/install.yml) [3] php{{ php_version }}-json if PHP < 8.0 (NEEDED FOR nextcloud/tasks/install.yml AND pbx/tasks/freepbx_dependencies.yml AND wordpress/tasks/install.yml)
       - uwsgi                   # Admin Console & roles/captiveportal should really install
       - uwsgi-plugin-python3    # these 2 packages on demand (not every IIAB needs these).
     state: present
@@ -35,7 +35,7 @@
     - { src: 'nginx.conf.j2', dest: '/etc/nginx/nginx.conf' }
     - { src: 'mime.types.j2', dest: '/etc/nginx/mime.types' }
     #- { src: 'ports.conf.j2', dest: '/etc/{{ apache_service }}/ports.conf' }    # Moved to enable-or-disable.yml
-    #- { src: 'iiab.conf.j2', dest: "{{ nginx_conf_dir }}/iiab.conf" }    # Moved into homepage.yml below
+    #- { src: 'iiab.conf.j2', dest: "{{ nginx_conf_dir }}/iiab.conf" }    # Moved into homepage.yml, later invoked by roles/www_options/tasks/main.yml
 
 - debug:
     msg: roles/nginx/tasks/homepage.yml will run LATER (invoked by roles/www_options/tasks/main.yml) SO THAT NGINX CAN REDIRECT http://box TO http://box{{ iiab_home_url }} (based on var iiab_home_url)
@@ -45,7 +45,6 @@
   systemd:
     name: "php{{ php_version }}-fpm"
     state: restarted
-  #when: nginx_enabled
 
 
 # RECORD NGINX AS INSTALLED