From fbf714154f45113886261f995da89c501cc482b3 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 11 Aug 2021 09:50:13 -0500 Subject: [PATCH 1/4] nginx - disable apache from starting on boot if present Or there might be a race for port 80 on reboot --- roles/nginx/tasks/install.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml index a4b95f0f7..d9d086f9d 100644 --- a/roles/nginx/tasks/install.yml +++ b/roles/nginx/tasks/install.yml @@ -2,6 +2,7 @@ systemd: name: "{{ apache_service }}" # apache2 or httpd, per /opt/iiab/iiab/vars/.yml state: stopped + enabled: no ignore_errors: yes # 'when: apache_installed is defined' insuff b/c mysql's php (etc) can install apache2 From 38ff8a99af895e8c116aa137a621649c86013164 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 11 Aug 2021 10:07:35 -0500 Subject: [PATCH 2/4] pbx - Enable apache when installed --- roles/pbx/tasks/enable-or-disable.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/roles/pbx/tasks/enable-or-disable.yml b/roles/pbx/tasks/enable-or-disable.yml index 4090d8757..111da6df4 100644 --- a/roles/pbx/tasks/enable-or-disable.yml +++ b/roles/pbx/tasks/enable-or-disable.yml @@ -25,10 +25,19 @@ command: a2dissite freepbx.conf when: not pbx_enabled - - name: Restart Apache service ({{ apache_service }}) + - name: Restart and Enable Apache service ({{ apache_service }}) if pbx_enabled systemd: name: "{{ apache_service }}" # apache2 state: restarted + enabled: yes + when: pbx_enabled + + - name: Stop and Disable Apache service ({{ apache_service }}) if not pbx_enabled + systemd: + name: "{{ apache_service }}" # apache2 + state: stopped + enabled: no + when: not pbx_enabled when: not pbx_try_nginx From d794a267b3f6d13e041c9792d18897db856cea16 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 11 Aug 2021 12:32:53 -0400 Subject: [PATCH 3/4] nginx/tasks/install.yml: "Stop & Disable" apache2 --- roles/nginx/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml index d9d086f9d..d9f3c4dda 100644 --- a/roles/nginx/tasks/install.yml +++ b/roles/nginx/tasks/install.yml @@ -1,4 +1,4 @@ -- name: Stop '{{ apache_service }}' systemd service, in case it exists +- name: Stop & Disable '{{ apache_service }}' systemd service, in case it exists systemd: name: "{{ apache_service }}" # apache2 or httpd, per /opt/iiab/iiab/vars/.yml state: stopped From 9d5778388877a915c95a344dccde7361bec4e496 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 11 Aug 2021 12:37:09 -0400 Subject: [PATCH 4/4] pbx/tasks/enable-or-disable.yml: "Stop & Disable" apache2 (etc) --- roles/pbx/tasks/enable-or-disable.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/pbx/tasks/enable-or-disable.yml b/roles/pbx/tasks/enable-or-disable.yml index 111da6df4..8505b05bd 100644 --- a/roles/pbx/tasks/enable-or-disable.yml +++ b/roles/pbx/tasks/enable-or-disable.yml @@ -25,16 +25,16 @@ command: a2dissite freepbx.conf when: not pbx_enabled - - name: Restart and Enable Apache service ({{ apache_service }}) if pbx_enabled + - name: Restart & Enable '{{ apache_service }}' systemd service, if pbx_enabled systemd: name: "{{ apache_service }}" # apache2 state: restarted enabled: yes when: pbx_enabled - - name: Stop and Disable Apache service ({{ apache_service }}) if not pbx_enabled + - name: Stop & Disable '{{ apache_service }}' systemd service, if not pbx_enabled systemd: - name: "{{ apache_service }}" # apache2 + name: "{{ apache_service }}" state: stopped enabled: no when: not pbx_enabled