From 1338d12eeb8323257b89e09ec632cde91645ede2 Mon Sep 17 00:00:00 2001
From: src386 <soyouz@src386.org>
Date: Fri, 21 Aug 2015 14:33:58 +0200
Subject: [PATCH] change private public policy

---
 README.md       |  3 +++
 scripts/install | 10 ++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 582b595..229d778 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,9 @@ Current Movim version : 20150820.
 - Added to language selection : ar, de, es, it, ja, nl, ru
 - Fix URL in manifest.json (was https://https://...)
 - Modified mysql password generation (no special car)
+- Public/Private policy changed. The SSO portal is not used anymore
+  But when a pod is marked as "private", only accounts with @yourdomain.com are able to connect.
+  This change was necessary for public content (blog)
 
 0.7b 2015-08-20
 - Update to upstream Movim 20150820 to fix #5
diff --git a/scripts/install b/scripts/install
index b9cdd4d..2bba7a3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -76,6 +76,10 @@ sudo su -c "cd $final_path && php mud.php config environment:production" movim
 sudo su -c "cd $final_path && php mud.php config timezone:`cat /etc/timezone`" movim
 sudo su -c "cd $final_path && php mud.php config username:$admin" movim
 sudo su -c "cd $final_path && php mud.php config password:`echo -n $password | sha1sum | awk '{print $1}'`" movim
+if [ $public_site = "No" ]; 
+then
+        sudo su -c "cd $final_path && php mud.php config xmppwhitelist:$domain" movim
+fi
 sudo yunohost app addaccess movim -u $admin
 
 # Copy init script or systemd service
@@ -103,12 +107,6 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/movim.conf
 
 # SSOwat Configuration
 sudo yunohost app setting movim skipped_uris -v "/"  
-if [ $public_site = "No" ];
-then              
-	sudo yunohost app setting movim protected_uris -v "/" 
-else              
-	sudo yunohost app setting movim protected_uris -v "/?q=admin"
-fi
 sudo yunohost app ssowatconf
 
 # Start Movim