YunoHost-Apps/pluxml_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pluxml_ynh.git synced 2024-09-03 20:16:02 +02:00
Code Issues Activity Actions

[fix] nginx: remove huge rebase shit.

Browse source
This commit is contained in:
Moul 2016-06-28 14:50:15 +02:00
parent 9084b5bbef
commit 3606354dfc
1 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
conf/nginx.conf
View file

@ -13,20 +13,6 @@ location YNH_EXAMPLE_PATH {
fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param SCRIPT_FILENAME $request_filename; fastcgi_param SCRIPT_FILENAME $request_filename;
} }
<<<<<<< HEAD
<<<<<<< HEAD
location YNH_EXAMPLE_PATH/data/medias{
=======
location YNH_EXAMPLE_FOLDER/data/images{
>>>>>>> 6dd6e03... [fix] support root subfolder, subfolder with and without trailing slash
allow all;
}
location YNH_EXAMPLE_FOLDER/data {
deny all;
return 403;
}
=======
location ^~ YNH_EXAMPLE_PATH/data/medias/ { location ^~ YNH_EXAMPLE_PATH/data/medias/ {
allow all; allow all;
} }
@ -36,7 +22,6 @@ location YNH_EXAMPLE_PATH {
return 403; return 403;
} }
>>>>>>> 63093af... [fix] path access issue
# Include SSOWAT user panel. # Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc; include conf.d/yunohost_panel.conf.inc;
} }