From 2dcfd1b09e4ec76c3bfaa38213916e7484a012df Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Sun, 26 Apr 2020 01:19:56 +0200 Subject: [PATCH] nginx: Added full paths to includes of snippets / fastcgi_params To allow Ansible to validate the main config if placed on different locations --- roles/nginx/application/templates/root.conf | 2 +- roles/nginx/php/templates/server.conf | 2 +- roles/server/nextcloud/meta/main.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/nginx/application/templates/root.conf b/roles/nginx/application/templates/root.conf index 34522ea..807e047 100644 --- a/roles/nginx/application/templates/root.conf +++ b/roles/nginx/application/templates/root.conf @@ -1,4 +1,4 @@ -include snippets/global; +include {{ nginx_snippets_directory }}/global; index index.html index.htm; diff --git a/roles/nginx/php/templates/server.conf b/roles/nginx/php/templates/server.conf index 6593acf..ce40493 100644 --- a/roles/nginx/php/templates/server.conf +++ b/roles/nginx/php/templates/server.conf @@ -18,7 +18,7 @@ server { fastcgi_split_path_info ^(.+?\.php)(/.*)$; try_files $uri =404; fastcgi_index index.php; - include fastcgi_params; + include {{ 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 92186cd..4adccbb 100644 --- a/roles/server/nextcloud/meta/main.yml +++ b/roles/server/nextcloud/meta/main.yml @@ -54,7 +54,7 @@ dependencies: # fastcgi_split_path_info ^(.+?\.php)(/.*)$; # try_files $uri =404; # fastcgi_index index.php; - # include fastcgi_params; + # include {{ 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; @@ -68,7 +68,7 @@ dependencies: fastcgi_split_path_info ^(.+?\.php)(/.*)$; try_files $fastcgi_script_name =404; fastcgi_index index.php; - include fastcgi_params; + include {{ 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;