From 5c8bb3c06f58131835c72d7bdc5fcfb876b08731 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 11 Aug 2021 11:00:57 -0500 Subject: [PATCH] drop .service and save a daemon_reload call --- roles/9-local-addons/tasks/main.yml | 4 ++-- roles/nginx/tasks/enable-or-disable.yml | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/roles/9-local-addons/tasks/main.yml b/roles/9-local-addons/tasks/main.yml index b5cc5caea..dec65b67a 100644 --- a/roles/9-local-addons/tasks/main.yml +++ b/roles/9-local-addons/tasks/main.yml @@ -37,10 +37,10 @@ name: pbx when: pbx_install -- name: start iiab-nginx on port {{ nginx_port }} +- name: Restart iiab-nginx on port {{ nginx_port }} systemd: daemon_reload: yes - name: iiab-nginx.service + name: iiab-nginx state: restarted when: nginx_port|int != 80 or nginx_dir != "/etc/nginx" diff --git a/roles/nginx/tasks/enable-or-disable.yml b/roles/nginx/tasks/enable-or-disable.yml index e519f330d..15f1c70b5 100644 --- a/roles/nginx/tasks/enable-or-disable.yml +++ b/roles/nginx/tasks/enable-or-disable.yml @@ -25,13 +25,6 @@ # enabled: true # when: apache_installed is defined and apache_enabled # or not nginx_enabled -- name: Start iiab-nginx on port {{ nginx_port }} - systemd: - daemon_reload: yes - name: iiab-nginx.service - state: restarted - when: nginx_port|int != 80 or nginx_dir != "/etc/nginx" - - name: Enable & (Re)Start 'nginx' systemd service, if nginx_enabled systemd: name: nginx @@ -40,6 +33,13 @@ state: restarted when: nginx_enabled +- name: Start iiab-nginx on port {{ nginx_port }} + systemd: + name: iiab-nginx + enabled: yes + state: restarted + when: nginx_port|int != 80 or nginx_dir != "/etc/nginx" + - name: Disable & Stop 'nginx' systemd service, if not nginx_enabled systemd: name: nginx