Typo, comments refined

roles/4-server-options/tasks/main.yml

@@ -42,7 +42,8 @@
     name: samba
   when: samba_install | bool
 
-# DOES THE FLAG BELOW (apache_allow_sudo) WORK WITH NGINX TOO ?
+# 2020-02-12: DOES THE FLAG BELOW (apache_allow_sudo) WORK WITH NGINX TOO ?
+# COMPARE apache_high_php_limits @ web_support/tasks/main.yml
 
 - name: Give {{ apache_user }} (per variable apache_user) permission to poweroff, installing /etc/sudoers.d/020_apache_poweroff from template
   template:

roles/httpd/tasks/main.yml

@@ -1,14 +1,3 @@
-# 2020-01-23 TO DO / Questions:
-# - [DONE] Validate input vars apache_install & apache_enabled here.
-#   - Use as nec, with 'when: apache_installed is undefined'
-# - [DONE: moved them to roles/web_support] Encapsulate all 3 tasks below into httpd/roles/install.yml ?
-# - Similarly sanity-check httpd/roles/enable.yml or httpd/roles/enable-or-disable.yml...
-#   - Verify that 9-local-addons/tasks/main.yml's invocation of
-#     roles/httpd/tasks/enable.yml (via roles/httpd-enable/tasks/main.yml, if
-#     apache_enabled is True) does the right thing!
-#   - And that we really don't want to invoke it hereunder?
-# - [DONE] Save relevant apache_* vars to /etc/iiab/iiab.ini
-
 # "How do i fail a task in Ansible if the variable contains a boolean value?
 # I want to perform input validation for Ansible playbooks"
 # https://stackoverflow.com/questions/46664127/how-do-i-fail-a-task-in-ansible-if-the-variable-contains-a-boolean-value-i-want/46667499#46667499

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

@@ -1,23 +1,23 @@
 - name: Ensure that Apache (({{ apache_service }})) is not running -- we may need port swap
   systemd:
-    name: "{{ apache_service }}"
+    name: "{{ apache_service }}"    # apache2 or httpd, per /opt/iiab/iiab/vars/<OS>.yml
     state: stopped
 
 - 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"
+    dest: "/etc/{{ apache_service }}/ports.conf"    # apache2 or httpd
   when: nginx_enabled | bool
 
 - 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"
+    dest: "/etc/{{ apache_service }}/ports.conf"    # apache2 or httpd
   when: not nginx_enabled
 
 - name: Enable & Restart '{{ apache_service }}' if apache_enabled or not nginx_enabled, since we stopped it
   systemd:
-    name: "{{ apache_service }}"
+    name: "{{ apache_service }}"    # apache2 or httpd, per /opt/iiab/iiab/vars/<OS>.yml
     daemon_reload: yes
     state: restarted
     enabled: true

roles/nginx/tasks/install.yml

@@ -29,7 +29,7 @@
     path: /etc/nginx/sites-enabled/default
     state: absent
 
-- name: 'Install 3-or-4 files from template: /etc/nginx/server.conf, /etc/nginx/nginx.conf, /etc/{{ apache_service }}/ports.conf'
+- name: 'Install 3 files from template: /etc/nginx/server.conf, /etc/nginx/nginx.conf, {{ nginx_conf_dir }}/iiab.conf'
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
@@ -37,7 +37,7 @@
     - { src: 'server.conf.j2', dest: '/etc/nginx/server.conf' }
     - { src: 'nginx.conf.j2', dest: '/etc/nginx/nginx.conf' }
     #- { 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" }
+    - { src: 'iiab.conf.j2', dest: "{{ nginx_conf_dir }}/iiab.conf" }    # /etc/nginx/conf.d
 
 # php-stem extension installed by roles/web_support/tasks/php-stem.yml
 # here it is linked to php-fpm

roles/web_support/tasks/main.yml

@@ -3,7 +3,8 @@
 
 - include_tasks: php-stem.yml
 
-# DOES THE FLAG BELOW (apache_high_php_limits) WORK WITH NGINX TOO?
+# 2020-02-12: DOES THE FLAG BELOW (apache_high_php_limits) WORK WITH NGINX TOO?
+# COMPARE apache_allow_sudo @ 4-server-options/tasks/main.yml
 
 # For schools that use WordPress/Nextcloud/Moodle intensively.  iiab/iiab#1147
 # WARNING: Enabling this might cause excess use of RAM/disk or other resources!