From 98b7f4744e703419a52a1faf83f370a15322b751 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Wed, 17 Jun 2020 19:28:20 +0200 Subject: [PATCH] Extracted service_name of nginx to global var --- group_vars/all/vars.yml | 2 ++ roles/acme/certificate/defaults/main.yml | 2 +- roles/nginx/application/handlers/main.yml | 4 ++-- roles/nginx/application/tasks/main.yml | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml index b8db4f1..2f57954 100644 --- a/group_vars/all/vars.yml +++ b/group_vars/all/vars.yml @@ -108,6 +108,8 @@ global_log_directory: "/var/log" global_nfs_port: "2049" # for version 4 global_nfs_directory: "{{ global_webservers_directory }}/nfs" +global_nginx_service_name: "nginx.service" + global_pamd: "/etc/pam.d" global_redis_configuration_directory: "/etc/redis" diff --git a/roles/acme/certificate/defaults/main.yml b/roles/acme/certificate/defaults/main.yml index d4d688d..fd503d3 100644 --- a/roles/acme/certificate/defaults/main.yml +++ b/roles/acme/certificate/defaults/main.yml @@ -6,4 +6,4 @@ acme_certificate_prefix: "{{ acme_certificates_directory }}/{{ domain }}" acme_certificate_location: "{{ acme_certificate_prefix }}.crt" acme_key_location: "{{ acme_certificate_prefix }}.key" -reload_command: "systemctl reload nginx" +reload_command: "systemctl reload {{ global_nginx_service_name }}" diff --git a/roles/nginx/application/handlers/main.yml b/roles/nginx/application/handlers/main.yml index 21732df..9c3b17c 100644 --- a/roles/nginx/application/handlers/main.yml +++ b/roles/nginx/application/handlers/main.yml @@ -3,11 +3,11 @@ - name: reload nginx systemd: enabled: yes - name: nginx + name: "{{ global_nginx_service_name }}" state: reloaded - name: restart nginx systemd: enabled: yes - name: nginx + name: "{{ global_nginx_service_name }}" state: restarted diff --git a/roles/nginx/application/tasks/main.yml b/roles/nginx/application/tasks/main.yml index d941de2..0dd22a7 100644 --- a/roles/nginx/application/tasks/main.yml +++ b/roles/nginx/application/tasks/main.yml @@ -66,7 +66,7 @@ - name: Enable nginx service systemd: enabled: yes - name: nginx + name: "{{ global_nginx_service_name }}" - name: Configure nginx template: