From 2aa825c3e226d6c434922202fc09db5ff45ad463 Mon Sep 17 00:00:00 2001
From: polytan02 <polytan02@mcgva.org>
Date: Sat, 11 Apr 2015 15:01:19 +0100
Subject: [PATCH] Update base scripts

---
 scripts/install | 10 ++++++++--
 scripts/remove  | 25 ++++++++++++++-----------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/scripts/install b/scripts/install
index 2bcf76a..551e616 100644
--- a/scripts/install
+++ b/scripts/install
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Retrieve arguments
+app=webapp_multi
 domain=$1
 path=$2
 user=$3
@@ -14,7 +15,6 @@ then
 	sitename="root"
 fi
 
-app=webapp_multi_$domain_$sitename
 final_path=/var/www/$app_$domain_$sitename
 
 
@@ -24,6 +24,12 @@ if [[ ! $? -eq 0 ]]; then
     exit 1
 fi
 
+sudo yunohost app setting $app final_path -v $final_path
+sudo yunohost app setting $app domain -v $domain
+sudo yunohost app setting $app path -v $path
+sudo yunohost app setting $app sitename -v $sitename
+
+
 # Check user
 sudo yunohost user list --json | grep -q "\"username\": \"$user\""
 if [[ ! $? -eq 0 ]]; then
@@ -88,7 +94,7 @@ 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 "$domain$path"
+    sudo yunohost app setting $app skipped_uris -v "/$domain$path"
 fi
 
 # Reload Nginx and regenerate SSOwat conf
diff --git a/scripts/remove b/scripts/remove
index bdb0b54..7289c84 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,22 +1,25 @@
 #!/bin/bash
 
-user=$(sudo yunohost app setting my_webapp user)
-path=$(sudo yunohost app setting my_webapp path)
-domain=$(sudo yunohost app setting my_webapp domain)
-parent_dir=/var/www/webapp_$user
-name=$(echo $path | cut -d '/' -f 2)
-final_path=$parent_dir$path
+app=webapp_multi
+
+user=$(sudo yunohost app setting $app user)
+path=$(sudo yunohost app setting $app path)
+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
+
 # Suppression de la config nginx de la webapp
-sudo rm -f /etc/nginx/conf.d/$domain.d/$name.conf
+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
+#if test -z "$(ls $parent_dir | head -n1)"
+#then
+#    sudo rmdir $parent_dir
+#fi
 
 sudo service nginx reload
 sudo yunohost app ssowatconf