From 5329ca8292e0b3e2bb6d9837dc93df50e3aafe35 Mon Sep 17 00:00:00 2001
From: magikcypress <cyp@rouquin.me>
Date: Sun, 26 Mar 2017 15:36:46 +0200
Subject: [PATCH] Suppression de l'option multisite

---
 conf/nginx.conf | 5 -----
 scripts/install | 4 +---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 6c5ec74..da3ef19 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,8 +1,3 @@
-#--MULTISITE--if (!-e $request_filename) {
-	#--MULTISITE--rewrite /ecrire$ $scheme://$host$uri/ permanent;
-	#--MULTISITE--rewrite ^__PATHTOCHANGE__(/[^/]+)?(/.*\.php)$ __PATHTOCHANGE__$2 last;
-#--MULTISITE--}
-
 location __PATHTOCHANGE__ {
 		alias __FINALPATH__/;
 		index index.php;
diff --git a/scripts/install b/scripts/install
index 9772213..d9d1f43 100644
--- a/scripts/install
+++ b/scripts/install
@@ -17,7 +17,6 @@ domain=$YNH_APP_ARG_DOMAIN
 path=$YNH_APP_ARG_PATH
 admin_spip=$YNH_APP_ARG_ADMIN
 language=$YNH_APP_ARG_LANGUAGE
-#multisite=$YNH_APP_ARG_MULTISITE
 is_public=$YNH_APP_ARG_IS_PUBLIC
 ldap=$YNH_APP_ARG_LDAP
 
@@ -39,7 +38,6 @@ ynh_app_setting_set $app admin $admin_spip
 ynh_app_setting_set $app is_public $is_public
 ynh_app_setting_set $app language $language
 ynh_app_setting_set $app ldap $ldap
-#ynh_app_setting_set $app multisite $multisite
 
 GENERATE_DB $app	# Create a database and a dedicated user in the app name
 
@@ -108,7 +106,7 @@ done
 mysql --debug-check -u $db_user -p$db_pwd $db_user < ../conf/sql/spip.sql
 
 # Use LDAP for SPIP
-if [ "$ldap" = "Yes" ];
+if [ "${ldap}" = "Yes" ];
 then
 	sudo cp ../conf/ldap.php $final_path/config/ldap.php
 	sudo sed -i "s/__LDAP__/ldap/g" $final_path/config/connect.php