From ab802485cde70a70ed1b085238ccdd417ee628b9 Mon Sep 17 00:00:00 2001
From: polytan02 <polytan02@mcgva.org>
Date: Sat, 11 Apr 2015 15:49:10 +0100
Subject: [PATCH] Storage in subfolder for cleaner approach

---
 scripts/install | 10 ++++++----
 scripts/remove  | 19 ++++++++++++-------
 scripts/upgrade |  4 +++-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/scripts/install b/scripts/install
index 571b6f5..268b78a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Retrieve arguments
-app=webapp_multi
+app=webapp_multi_inst
 domain=$1
 path=$2
 user=$3
@@ -15,7 +15,7 @@ then
 	sitename="root"
 fi
 
-final_path=/var/www/$app\_$domain\_$sitename
+final_path=/var/www/webapp\_multi/$domain/$sitename
 
 
 # Check domain/path availability
@@ -49,7 +49,7 @@ sudo yunohost app setting $app user -v $user
 
 # Creation of folder
 sudo rm -rf $final_path
-sudo mkdir $final_path
+sudo mkdir -p $final_path
 
 # Base site
 sudo cp ../sources/index.html $final_path/
@@ -94,7 +94,9 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$sitename.conf
 sudo yunohost app setting $app is_public -v "$is_public"
 if [ "$is_public" = "Yes" ];
 then
-    sudo yunohost app setting $app skipped_uris -v "/"
+	sudo yunohost app setting $app skipped_uris -v "/"
+else
+	sudo yunohost app setting $app protected_uris -v "/"
 fi
 
 # Reload Nginx and regenerate SSOwat conf
diff --git a/scripts/remove b/scripts/remove
index 7289c84..ab94dcc 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-app=webapp_multi
+app=webapp_multi_inst
 
 user=$(sudo yunohost app setting $app user)
 path=$(sudo yunohost app setting $app path)
+sitename=$(sudo yunohost app setting $app sitename)
 domain=$(sudo yunohost app setting $app domain)
 final_path=$(sudo yunohost app setting $app final_path)
 
-sitename=$(echo $path | cut -d '/' -f 2)
 
 # Suppression du dossier de la webapp
 sudo rm -rf $final_path
@@ -15,11 +15,16 @@ sudo rm -rf $final_path
 # Suppression de la config nginx de la webapp
 sudo rm -f /etc/nginx/conf.d/$domain.d/$sitename.conf
 
-# Vérifie si le dossier parent est vide. Ce qui signifie que toutes les webapp ont été désinstallées. Ainsi que le client ftp net2ftp.
-#if test -z "$(ls $parent_dir | head -n1)"
-#then
-#    sudo rmdir $parent_dir
-#fi
+# We check if folders are empty and if yes we delete them
+if test -z "$(ls /var/www/webapp_multi/$domain | head -n1)"
+then
+	sudo rmdir /var/www/webapp_multi/$domain
+fi
+
+if test -z "$(ls /var/www/webapp_multi/ | head -n1)"
+then
+	sudo rmdir /var/www/webapp_multi
+fi
 
 sudo service nginx reload
 sudo yunohost app ssowatconf
diff --git a/scripts/upgrade b/scripts/upgrade
index 942f1c1..b818e71 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Retrieve arguments
-app=webapp_multi
+app=webapp_multi_inst
 
 domain=$(sudo yunohost app setting $app domain)
 path=$(sudo yunohost app setting $app path)
@@ -23,6 +23,8 @@ sudo yunohost app setting $app is_public -v "$is_public"
 if [ "$is_public" = "Yes" ];
 then
     sudo yunohost app setting $app skipped_uris -v "/"
+else
+    sudo yunohost app setting $app protected_uris -v "/"
 fi
 
 # Reload Nginx and regenerate SSOwat conf