From d6ac2bb3a5558bceabaec015bfe338befd14e38c Mon Sep 17 00:00:00 2001
From: src386 <soyouz@src386.org>
Date: Mon, 3 Aug 2015 15:37:44 +0200
Subject: [PATCH] Getting close to release

---
 README.md       | 5 +++++
 conf/nginx.conf | 2 +-
 scripts/install | 8 +++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 79ed700..78200c9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,9 @@
 Movim for Yunohost.
+==========
+
+Movim is a decentralized social network, written in PHP and HTML5 and based on the XMPP standard protocol.
+
+Current Movim version : 20150731.
 
 WIP !!!
 APP NOT READY YET !!!
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 7951152..2c39ac7 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -18,7 +18,7 @@ location PATHTOCHANGE {
      	 fastcgi_param SCRIPT_FILENAME $request_filename;
   	}
 
-location ~ ^PATHTOCHANGE/ws/ {
+location PATHTOCHANGE/ws/ {
 	   proxy_pass http://localhost:8080/;
     	   proxy_http_version 1.1;
 	   proxy_set_header Upgrade $http_upgrade;
diff --git a/scripts/install b/scripts/install
index 6b9b2de..2b0f671 100644
--- a/scripts/install
+++ b/scripts/install
@@ -3,7 +3,8 @@
 # Retrieve arguments
 domain=$1
 path=$2
-public_site=$3
+admin=$3
+public_site=$4
 
 # Check domain/path availability
 sudo yunohost app checkurl $domain$path -a movim
@@ -11,6 +12,7 @@ if [[ ! $? -eq 0 ]]; then
 exit 1
 fi
 
+sudo yunohost app setting movim admin -v $admin
 sudo yunohost app setting movim public_site -v $public_site
 
 # Generate random password
@@ -44,7 +46,7 @@ sudo sed -i "s/yhdb/$db_user/g" $final_path/config/db.inc.php
 
 # Populate Movim database
 sudo su -c "cd $final_path && php mud.php db set" -s /bin/sh www-data
-#sudo yunohost app addaccess movim -u $admin
+sudo yunohost app addaccess movim -u $admin
 
 # Copy init script if Wheezy
 sudo cp ../conf/movim.init /etc/init.d/movim
@@ -64,7 +66,7 @@ if [ $public_site = "No" ];
 then              
 	sudo yunohost app setting movim protected_uris -v "/admin,/index.php" 
 else              
-	sudo yunohost app setting movim protected_uris -v "/admin/index.php,/admin/logs_studs.txt,/scripts"
+	sudo yunohost app setting movim protected_uris -v "/admin,/index.php,?q=admin"
 fi
 sudo yunohost app ssowatconf