From bad29ef90e525c4f15dcc426c92f3bc358c222f9 Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Tue, 9 Aug 2016 19:19:28 +0200
Subject: [PATCH] =?UTF-8?q?[enh]=20#12,=20grant=20access=20to=20the=20grap?=
 =?UTF-8?q?hical=20interface=20only=20to=20the=20admin.=20-=20install,=20u?=
 =?UTF-8?q?pgrade:=C2=A0protect=20the=20path=20and=20grant=20access=20to?=
 =?UTF-8?q?=20admin=20user.=20-=20upgrade:=20forget=20to=20comment=20unuse?=
 =?UTF-8?q?d=20sed.=20-=20Update=20readme:=20add=20information=20about=20w?=
 =?UTF-8?q?ebadmin=20on=20root=20path.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md       | 4 ++++
 scripts/install | 6 +++---
 scripts/upgrade | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 028ac1f..b8c46f1 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,10 @@
 
 ## Install
 
+- Web admin can only be installed on root path for now.
+Use a domain name like `duniter.domain.tld` for instance.
+See [#18](https://github.com/duniter/duniter_ynh/issues/18) for more details.
+
 ```bash
 sudo yunohost app install https://github.com/duniter/duniter_ynh
 ```
diff --git a/scripts/install b/scripts/install
index b76daa7..1d8fbcc 100755
--- a/scripts/install
+++ b/scripts/install
@@ -81,13 +81,13 @@ sudo $app webstart
 sudo yunohost service add $app --log /home/admin/.config/$app/"$app"_default/"$app".log
 
 # Add admin to the allowed users
-#sudo yunohost app addaccess $app -u $admin
+sudo yunohost app addaccess $app -u $admin
 
 # Allow only allowed users to access admin panel
-#ynh_app_setting_set "$app" protected_uris "/"
+ynh_app_setting_set "$app" protected_uris "/"
 
 # SSOwat Configuration
-ynh_app_setting_set "$app" unprotected_uris "/" # "api/"
+#ynh_app_setting_set "$app" unprotected_uris "/api/"
 
 # Configure Nginx
 nginx_conf="../conf/nginx.conf"
diff --git a/scripts/upgrade b/scripts/upgrade
index 42ea9e9..559aa0b 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -39,17 +39,17 @@ sudo $app webstart
 path=${path%/}
 
 # Add admin to the allowed users
-#sudo yunohost app addaccess $app -u $admin
+sudo yunohost app addaccess $app -u $admin
 
 # Allow only allowed users to access admin panel
-#ynh_app_setting_set "$app" protected_uris "/"
+ynh_app_setting_set "$app" protected_uris "/"
 
 # SSOwat Configuration
-ynh_app_setting_set "$app" unprotected_uris "/" # "api/"
+#ynh_app_setting_set "$app" unprotected_uris "/api/"
 
 # Upgrade Nginx configuration
 nginx_conf="../conf/nginx.conf"
-sudo sed -i "s@YNH_EXAMPLE_PATH@$path@g" $nginx_conf
+#sudo sed -i "s@YNH_EXAMPLE_PATH@$path@g" $nginx_conf
 sudo sed -i "s@YNH_EXAMPLE_PORT@$port@" $nginx_conf
 sudo sed -i "s@YNH_EXAMPLE_DOMAIN@$domain@" $nginx_conf
 sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf