From a9c8fd9af39009ebed75348a4022091c43a1e2f0 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Sun, 21 Jun 2020 17:45:08 +0200 Subject: [PATCH] Moved var nginx_installation_directory to global vars --- group_vars/all/vars.yml | 1 + roles/nginx/application/defaults/main.yml | 9 ++++----- roles/nginx/application/tasks/main.yml | 4 ++-- roles/nginx/application/templates/nginx.conf | 6 +++--- roles/nginx/php/templates/server.conf | 4 ++-- roles/server/nextcloud/meta/main.yml | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml index 0d6e4ce..2d0f02f 100644 --- a/group_vars/all/vars.yml +++ b/group_vars/all/vars.yml @@ -115,6 +115,7 @@ global_nfs_directory: "{{ global_webservers_directory }}/nfs" global_nginx_system_user: www-data global_nginx_service_name: "nginx.service" +global_nginx_installation_directory: "/etc/nginx" global_pamd: "/etc/pam.d" diff --git a/roles/nginx/application/defaults/main.yml b/roles/nginx/application/defaults/main.yml index bf9393a..bf07c53 100644 --- a/roles/nginx/application/defaults/main.yml +++ b/roles/nginx/application/defaults/main.yml @@ -1,10 +1,9 @@ --- -nginx_installation_directory: "/etc/nginx" -nginx_upstreams_directory: "{{ nginx_installation_directory }}/upstreams" -nginx_sites_directory: "{{ nginx_installation_directory }}/sites" -nginx_streams_directory: "{{ nginx_installation_directory }}/streams" -nginx_snippets_directory: "{{ nginx_installation_directory }}/snippets" +nginx_upstreams_directory: "{{ global_nginx_installation_directory }}/upstreams" +nginx_sites_directory: "{{ global_nginx_installation_directory }}/sites" +nginx_streams_directory: "{{ global_nginx_installation_directory }}/streams" +nginx_snippets_directory: "{{ global_nginx_installation_directory }}/snippets" nginx_global_log_directory: "{{ global_log_directory }}/nginx" nginx_global_access_log: "{{ nginx_global_log_directory }}/access.log" diff --git a/roles/nginx/application/tasks/main.yml b/roles/nginx/application/tasks/main.yml index b8e0923..4d7bef4 100644 --- a/roles/nginx/application/tasks/main.yml +++ b/roles/nginx/application/tasks/main.yml @@ -9,7 +9,7 @@ - name: Remove unnecessary directories file: state: absent - name: "{{ nginx_installation_directory }}/{{ item }}" + name: "{{ global_nginx_installation_directory }}/{{ item }}" with_items: "{{ nginx_unnecessary_files }}" - name: Create directories for nginx @@ -71,7 +71,7 @@ - name: Configure nginx template: src: nginx.conf - dest: "{{ nginx_installation_directory }}/nginx.conf" + dest: "{{ global_nginx_installation_directory }}/nginx.conf" validate: /usr/sbin/nginx -t -c %s notify: reload nginx diff --git a/roles/nginx/application/templates/nginx.conf b/roles/nginx/application/templates/nginx.conf index b15f669..d82856a 100644 --- a/roles/nginx/application/templates/nginx.conf +++ b/roles/nginx/application/templates/nginx.conf @@ -1,7 +1,7 @@ user {{ global_nginx_system_user }} {{ global_nginx_system_user }}; worker_processes auto; pid /run/nginx.pid; -include {{ nginx_installation_directory }}/modules-enabled/*.conf; +include {{ global_nginx_installation_directory }}/modules-enabled/*.conf; error_log {{ nginx_global_error_log }}; @@ -26,7 +26,7 @@ http { # server_names_hash_bucket_size 64; # server_name_in_redirect off; - include {{ nginx_installation_directory }}/mime.types; + include {{ global_nginx_installation_directory }}/mime.types; default_type application/octet-stream; ## @@ -79,7 +79,7 @@ http { # Virtual Host Configs ## - include {{ nginx_installation_directory }}/conf.d/*.conf; + include {{ global_nginx_installation_directory }}/conf.d/*.conf; include {{ nginx_sites_directory }}/*; include {{ nginx_upstreams_directory }}/*; diff --git a/roles/nginx/php/templates/server.conf b/roles/nginx/php/templates/server.conf index d542ecf..6af95b9 100644 --- a/roles/nginx/php/templates/server.conf +++ b/roles/nginx/php/templates/server.conf @@ -19,7 +19,7 @@ server { {{ status_page_acl | indent(width=4) }} fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_index index.php; - include {{ nginx_installation_directory }}/fastcgi_params; + include {{ global_nginx_installation_directory }}/fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param HTTPS on; @@ -35,7 +35,7 @@ server { fastcgi_split_path_info ^(.+?\.php)(/.*)$; try_files $uri =404; fastcgi_index index.php; - include {{ nginx_installation_directory }}/fastcgi_params; + include {{ global_nginx_installation_directory }}/fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param HTTPS on; diff --git a/roles/server/nextcloud/meta/main.yml b/roles/server/nextcloud/meta/main.yml index 43e45e3..0e47763 100644 --- a/roles/server/nextcloud/meta/main.yml +++ b/roles/server/nextcloud/meta/main.yml @@ -56,7 +56,7 @@ dependencies: # fastcgi_split_path_info ^(.+?\.php)(/.*)$; # try_files $uri =404; # fastcgi_index index.php; - # include {{ nginx_installation_directory }}/fastcgi_params; + # include {{ global_nginx_installation_directory }}/fastcgi_params; # fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; # fastcgi_param PATH_INFO $fastcgi_path_info; # fastcgi_param HTTPS on; @@ -70,7 +70,7 @@ dependencies: fastcgi_split_path_info ^(.+?\.php)(/.*)$; try_files $fastcgi_script_name =404; fastcgi_index index.php; - include {{ nginx_installation_directory }}/fastcgi_params; + include {{ global_nginx_installation_directory }}/fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param HTTPS on; @@ -93,7 +93,7 @@ dependencies: {{ status_page_acl | indent(width=2) }} fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_index index.php; - include {{ nginx_installation_directory }}/fastcgi_params; + include {{ global_nginx_installation_directory }}/fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param HTTPS on;