From d77b157bcc87541965e7bdee27d7bc6d3be0108d Mon Sep 17 00:00:00 2001 From: frju365 Date: Sat, 27 Oct 2018 17:47:12 +0200 Subject: [PATCH] [enh] Set Path as full-path (#563) * [fix] Set Path as full-path * same * Update yunohost_admin.conf --- data/templates/nginx/plain/yunohost_admin.conf | 4 ++-- data/templates/nginx/server.tpl.conf | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/templates/nginx/plain/yunohost_admin.conf b/data/templates/nginx/plain/yunohost_admin.conf index 41065d2bc..3de66e3e6 100644 --- a/data/templates/nginx/plain/yunohost_admin.conf +++ b/data/templates/nginx/plain/yunohost_admin.conf @@ -73,6 +73,6 @@ server { access_by_lua_file /usr/share/ssowat/access.lua; } - include conf.d/yunohost_admin.conf.inc; - include conf.d/yunohost_api.conf.inc; + include /etc/nginx/conf.d/yunohost_admin.conf.inc; + include /etc/nginx/conf.d/yunohost_api.conf.inc; } diff --git a/data/templates/nginx/server.tpl.conf b/data/templates/nginx/server.tpl.conf index bf2f36cb7..9acc641ae 100644 --- a/data/templates/nginx/server.tpl.conf +++ b/data/templates/nginx/server.tpl.conf @@ -5,7 +5,7 @@ server { access_by_lua_file /usr/share/ssowat/access.lua; - include conf.d/{{ domain }}.d/*.conf; + include /etc/nginx/conf.d/{{ domain }}.d/*.conf; location /yunohost/admin { return 301 https://$http_host$request_uri; @@ -79,10 +79,10 @@ server { access_by_lua_file /usr/share/ssowat/access.lua; - include conf.d/{{ domain }}.d/*.conf; + include /etc/nginx/conf.d/{{ domain }}.d/*.conf; - include conf.d/yunohost_admin.conf.inc; - include conf.d/yunohost_api.conf.inc; + include /etc/nginx/conf.d/yunohost_admin.conf.inc; + include /etc/nginx/conf.d/yunohost_api.conf.inc; access_log /var/log/nginx/{{ domain }}-access.log; error_log /var/log/nginx/{{ domain }}-error.log;