From 2f8a1f47146f6d8d67243f94d11de2b8eb22dea7 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Fri, 27 Mar 2015 23:20:31 +0100
Subject: [PATCH] Domaine dans les regex

---
 scripts/install | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 690b020..d4aeaea 100644
--- a/scripts/install
+++ b/scripts/install
@@ -22,6 +22,9 @@ fi
 # Vérifie l'absence du / en fin de path
 pathRslash=$(echo "$path" | sed 's@/$@@')
 
+# Modifie le domaine pour qu'il passe dans une regex
+domain_regex=$(echo "$domain" | sed 's@-@.@g')
+
 # Check domain/path availability
 sudo yunohost app checkurl $domain$path -a $app
 if [[ ! $? -eq 0 ]]; then
@@ -112,7 +115,7 @@ sudo sed -i "s@__PORT__@$port@g" /etc/nginx/conf.d/$domain.d/$app.conf
 sudo yunohost app setting $app skipped_uris -v "/"
 if [ "$is_public" = "No" ];
 then	# Si l'app est privée, seul le visionnage des images reste public
-	sudo yunohost app setting $app protected_regex -v "$pathRslash/stats$","$pathRslash/manifest.webapp$","$pathRslash/$","$pathRslash/d/.*$","$pathRslash/m/.*$"
+	sudo yunohost app setting $app protected_regex -v "$domain_regex$pathRslash/stats$","$domain_regex$pathRslash/manifest.webapp$","$domain_regex$pathRslash/$","$domain_regex$pathRslash/d/.*$","$domain_regex$pathRslash/m/.*$"
 fi
 
 # Making log symbolic link to /var/log