external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-15 04:32:11 +00:00
Code Issues Releases Wiki Activity

Merge pull request #507 from jvonau/pbx-dual

Browse source 
Pull from jvonau:pbx-dual
This commit is contained in:
A Holt 2021-08-17 13:26:32 -04:00 committed by GitHub
commit 66489c9fbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/pbx/defaults/main.yml
View file

@ -4,6 +4,8 @@
# pbx_install: False # pbx_install: False
# pbx_enabled: 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, # 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 ! # # AFTER READING https://github.com/iiab/iiab/issues/2914 AND #2916, THX !

8
roles/pbx/tasks/enable-or-disable.yml
View file

@ -39,7 +39,7 @@
enabled: no enabled: no
when: not pbx_enabled when: not pbx_enabled
when: not pbx_try_nginx when: pbx_use_apache
- block: - block:
@ -79,4 +79,8 @@
name: nginx name: nginx
state: restarted 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

8
roles/pbx/tasks/freepbx.yml
View file

@ -64,8 +64,7 @@
- name: FreePBX - Install and configure Apache - if not pbx_try_nginx - name: FreePBX - Install and configure Apache - if not pbx_try_nginx
include_tasks: apache.yml include_tasks: apache.yml
when: not pbx_try_nginx when: pbx_use_apache
- name: FreePBX - Download {{ freepbx_url }}/{{ freepbx_src_file }} to {{ downloads_dir }} - name: FreePBX - Download {{ freepbx_url }}/{{ freepbx_src_file }} to {{ downloads_dir }}
get_url: 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! - 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 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" # - name: FreePBX - Add "$amp_conf['CHECKREFERER'] = false;" to /etc/freepbx.conf #2931 - if pbx_try_nginx"
# lineinfile: # lineinfile:
# path: /etc/freepbx.conf # path: /etc/freepbx.conf

4
roles/pbx/tasks/main.yml
View file

@ -23,13 +23,11 @@
include_tasks: install.yml include_tasks: install.yml
when: pbx_installed is undefined when: pbx_installed is undefined
- include_tasks: enable-or-disable.yml
- name: Install chan_dongle for Huawei USB modems - if asterisk_chan_dongle - name: Install chan_dongle for Huawei USB modems - if asterisk_chan_dongle
include: chan_dongle.yml include: chan_dongle.yml
when: asterisk_chan_dongle when: asterisk_chan_dongle
- include_tasks: enable-or-disable.yml
- name: Add 'pbx' variable values to {{ iiab_ini_file }} - name: Add 'pbx' variable values to {{ iiab_ini_file }}
ini_file: ini_file: