iiab-gen-iptables reads default_vars & local_vars, for ./runrole pbx

roles/0-init/defaults/main.yml

@@ -1,4 +1,4 @@
-# adm_cons_force_ssl: False
+# gui_port: 80    # 2021-08-17: For iptables.  And #2811 dreams of HTTPS/443 ?
 
 # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
@@ -6,8 +6,6 @@
 
 # SEE ALSO /opt/iiab/iiab/roles/1-prep/defaults/main.yml
 
-# 2021-07-30: Primarily for Admin Console: later change to 443 for #2811 HTTPS?
-gui_port: 80
 #is_F18: False                  # 2021-07-30: No longer used
 
 # (PRE-)release version number, for {{ iiab_env_file }} = /etc/iiab/iiab.env

roles/0-init/tasks/network.yml

@@ -59,12 +59,16 @@
   when: iiab_fqdn != ansible_fqdn
 
 
-- name: "Set 'gui_port: 80' for Admin Console if not adm_cons_force_ssl"
-  set_fact:
-    gui_port: 80
-  when: not adm_cons_force_ssl    # 2021-07-30: default_vars.yml initializes 'adm_cons_force_ssl: False'
+# 2021-08-17: (1) iiab-gen-iptables works better if gui_port is set directly in
+# default_vars.yml and/or local_vars.yml (2) Admin Console's iiab-admin.yml
+# and js-menu.yml set 'adm_cons_force_ssl: False'
 
-- name: "Set 'gui_port: 443' for Admin Console if adm_cons_force_ssl"
-  set_fact:
-    gui_port: 443
-  when: adm_cons_force_ssl
+# - name: "Set 'gui_port: 80' for Admin Console if not adm_cons_force_ssl"
+#   set_fact:
+#     gui_port: 80
+#   when: not adm_cons_force_ssl
+
+# - name: "Set 'gui_port: 443' for Admin Console if adm_cons_force_ssl"
+#   set_fact:
+#     gui_port: 443
+#   when: adm_cons_force_ssl