From 16fae31c6bb4ee8369949ada29c8f62d8071b00d Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Tue, 17 Aug 2021 00:11:13 -0500
Subject: [PATCH] dual mode - side by side

---
 roles/pbx/defaults/main.yml           | 2 ++
 roles/pbx/tasks/enable-or-disable.yml | 8 ++++++--
 roles/pbx/tasks/freepbx.yml           | 8 +-------
 roles/pbx/tasks/main.yml              | 4 +---
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/roles/pbx/defaults/main.yml b/roles/pbx/defaults/main.yml
index 5e4a70109..684913016 100644
--- a/roles/pbx/defaults/main.yml
+++ b/roles/pbx/defaults/main.yml
@@ -4,6 +4,8 @@
 
 # pbx_install: False
 # pbx_enabled: False
+pbx_use_apache: True
+pbx_use_nginx: True
 
 # pbx_try_nginx: False    # 2021-08-07: PLEASE TRY NGINX INSTEAD OF APACHE,
 # # AFTER READING https://github.com/iiab/iiab/issues/2914 AND #2916, THX !
diff --git a/roles/pbx/tasks/enable-or-disable.yml b/roles/pbx/tasks/enable-or-disable.yml
index 8505b05bd..f84a1d18d 100644
--- a/roles/pbx/tasks/enable-or-disable.yml
+++ b/roles/pbx/tasks/enable-or-disable.yml
@@ -39,7 +39,7 @@
       enabled: no
     when: not pbx_enabled
 
-  when: not pbx_try_nginx
+  when: pbx_use_apache
 
 
 - block:
@@ -79,4 +79,8 @@
       name: nginx
       state: restarted
 
-  when: pbx_try_nginx
+  when: pbx_use_nginx
+
+- name: FreePBX - Run 'fwconsole set CHECKREFERER 0' (0 means false) - if pbx_try_nginx - so 'Submit' button definitively works at http://box/freepbx >> Settings >> Advanced Settings -- FYI you can run 'fwconsole set -l' or 'fwconsole set CHECKREFERER' to view FreePBX settings -- FYI /etc/freepbx.conf can completely override FreePBX's stored settings if nec
+  command: fwconsole set CHECKREFERER 0    # Or/later run 'fwconsole set CHECKREFERER 1' (1 means true) to restore FreePBX's default strict checking.
+  when: pbx_use_nginx and not pbx_use_apache
diff --git a/roles/pbx/tasks/freepbx.yml b/roles/pbx/tasks/freepbx.yml
index 4a201e9f3..655b74d64 100644
--- a/roles/pbx/tasks/freepbx.yml
+++ b/roles/pbx/tasks/freepbx.yml
@@ -64,8 +64,7 @@
 
 - name: FreePBX - Install and configure Apache - if not pbx_try_nginx
   include_tasks: apache.yml
-  when: not pbx_try_nginx
-
+  when: pbx_use_apache
 
 - name: FreePBX - Download {{ freepbx_url }}/{{ freepbx_src_file }} to {{ downloads_dir }}
   get_url:
@@ -253,11 +252,6 @@
 - name: FreePBX - Run 'fwconsole ma upgradeall' on installed FreePBX modules, e.g. 16 default modules (of about 70 total) - CAN TAKE 1 MIN OR LONGER!
   command: fwconsole ma upgradeall
 
-- name: FreePBX - Run 'fwconsole set CHECKREFERER 0' (0 means false) - if pbx_try_nginx - so 'Submit' button definitively works at http://box/freepbx >> Settings >> Advanced Settings -- FYI you can run 'fwconsole set -l' or 'fwconsole set CHECKREFERER' to view FreePBX settings -- FYI /etc/freepbx.conf can completely override FreePBX's stored settings if nec
-  command: fwconsole set CHECKREFERER 0    # Or/later run 'fwconsole set CHECKREFERER 1' (1 means true) to restore FreePBX's default strict checking.
-  when: pbx_try_nginx
-
-
 # - name: FreePBX - Add "$amp_conf['CHECKREFERER'] = false;" to /etc/freepbx.conf #2931 - if pbx_try_nginx"
 #   lineinfile:
 #     path: /etc/freepbx.conf
diff --git a/roles/pbx/tasks/main.yml b/roles/pbx/tasks/main.yml
index 98f23103a..d3b82143c 100644
--- a/roles/pbx/tasks/main.yml
+++ b/roles/pbx/tasks/main.yml
@@ -23,13 +23,11 @@
   include_tasks: install.yml
   when: pbx_installed is undefined
 
-
-- include_tasks: enable-or-disable.yml
-
 - name: Install chan_dongle for Huawei USB modems - if asterisk_chan_dongle
   include: chan_dongle.yml
   when: asterisk_chan_dongle
 
+- include_tasks: enable-or-disable.yml
 
 - name: Add 'pbx' variable values to {{ iiab_ini_file }}
   ini_file: