From 78d5945e1cf36a5703669c5b7cf2264c50bee6c3 Mon Sep 17 00:00:00 2001
From: matlink <matlink@matlink.fr>
Date: Thu, 20 Aug 2015 23:01:42 +0200
Subject: [PATCH] [fix] removing useless .htaccess

whatever, it was removed anyway just after to be copied.
---
 conf/nginx.conf | 13 +++++++++++++
 scripts/install |  1 -
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 92a0ecd..1014ae5 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -13,6 +13,7 @@ location YNH_EXAMPLE_PATH {
 		fastcgi_param PATH_INFO $fastcgi_path_info;
 		fastcgi_param SCRIPT_FILENAME $request_filename;
 	}
+<<<<<<< HEAD
 <<<<<<< HEAD
 	location YNH_EXAMPLE_PATH/data/medias{
 =======
@@ -24,6 +25,18 @@ location YNH_EXAMPLE_PATH {
             deny all;
             return 403;
     }
+=======
+
+	location ^~ YNH_EXAMPLE_PATH/data/medias/ {
+        	allow all;
+	}
+
+	location ^~ YNH_EXAMPLE_FOLDER/data/ { 
+        	deny all; 
+            	return 403;
+	}
+
+>>>>>>> 63093af... [fix] path access issue
 	# Include SSOWAT user panel.
 	include conf.d/yunohost_panel.conf.inc;
 }
diff --git a/scripts/install b/scripts/install
index d35df86..c185e54 100644
--- a/scripts/install
+++ b/scripts/install
@@ -38,7 +38,6 @@ sudo mkdir -p $final_path
 
 #copy files to final folder and set permissions
 sudo cp -R ../sources/* $final_path/
-sudo cp ../sources/.htaccess $final_path/
 sudo find $final_path -type f -name ".htaccess" | xargs sudo rm
 
 #setup permissions