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

use pbx_apache_installed in place of pbx_use_apache

Browse source 
pbx_use_apache is an install time option
once installed the service needs to be accounted for
This commit is contained in:
Jerry Vonau 2023-04-02 08:24:45 -05:00
parent 07b310f5d5
commit 912fe4c610
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,13 +3,13 @@
- name: EITHER - Create symlink /etc/{{ apache_service }}/sites-enabled/freepbx.conf to enable Apache's http://box:{{ pbx_http_port }}/freepbx - if pbx_use_apache and pbx_enabled # http://box:83/freepbx - name: EITHER - Create symlink /etc/{{ apache_service }}/sites-enabled/freepbx.conf to enable Apache's http://box:{{ pbx_http_port }}/freepbx - if pbx_use_apache and pbx_enabled # http://box:83/freepbx
command: a2ensite freepbx.conf command: a2ensite freepbx.conf
when: pbx_use_apache and pbx_enabled when: pbx_apache_installed is defined and pbx_enabled
- name: OR ELSE - Delete symlink /etc/{{ apache_service }}/sites-enabled/freepbx.conf to disable Apache's http://box:{{ pbx_http_port }}/freepbx - if not (pbx_use_apache and pbx_enabled) - name: OR ELSE - Delete symlink /etc/{{ apache_service }}/sites-enabled/freepbx.conf to disable Apache's http://box:{{ pbx_http_port }}/freepbx - if not (pbx_use_apache and pbx_enabled)
file: # As 'a2dissite freepbx.conf' might not be installed file: # As 'a2dissite freepbx.conf' might not be installed
path: /etc/{{ apache_service }}/sites-enabled/freepbx.conf # apache2 path: /etc/{{ apache_service }}/sites-enabled/freepbx.conf # apache2
state: absent state: absent
when: pbx_use_apache and not pbx_enabled when: pbx_apache_installed and not pbx_enabled
- name: "ENACT ABOVE SETTING FOR APACHE - 'pbx_use_apache: False' might arise later, so best ALWAYS run..." - name: "ENACT ABOVE SETTING FOR APACHE - 'pbx_use_apache: False' might arise later, so best ALWAYS run..."
@ -21,8 +21,7 @@
name: "{{ apache_service }}" # apache2 name: "{{ apache_service }}" # apache2
state: restarted state: restarted
enabled: yes enabled: yes
when: pbx_use_apache and pbx_enabled when: pbx_apache_installed and pbx_enabled
ignore_errors: yes # In case Apache not installed
- name: OR ELSE - Stop & Disable '{{ apache_service }}' systemd service - if not (pbx_use_apache and pbx_enabled) - name: OR ELSE - Stop & Disable '{{ apache_service }}' systemd service - if not (pbx_use_apache and pbx_enabled)
systemd: systemd:
@ -30,8 +29,7 @@
name: "{{ apache_service }}" name: "{{ apache_service }}"
state: stopped state: stopped
enabled: no enabled: no
when: pbx_use_apache and not pbx_enabled when: pbx_apache_installed and not pbx_enabled
ignore_errors: yes # In case Apache not installed
- name: Open-or-Close Asterix ports (including Apache port {{ pbx_http_port }}) in iptables firewall, depending on pbx_enabled [{{ pbx_enabled }}] in local_vars.yml - in support of './runrole pbx' - name: Open-or-Close Asterix ports (including Apache port {{ pbx_http_port }}) in iptables firewall, depending on pbx_enabled [{{ pbx_enabled }}] in local_vars.yml - in support of './runrole pbx'
command: /usr/bin/iiab-gen-iptables command: /usr/bin/iiab-gen-iptables