From 9fad7b255ef162d17122ed948c3c0b82d1faf2e4 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@oslandia.com>
Date: Mon, 16 Dec 2019 22:54:16 +0100
Subject: [PATCH] Remove is_public for now, will be replaced by an
 allow_registration

---
 conf/diaspora.yml |  5 ++---
 scripts/install   | 25 ++++++++-----------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/conf/diaspora.yml b/conf/diaspora.yml
index 587817d..1f5b8d3 100644
--- a/conf/diaspora.yml
+++ b/conf/diaspora.yml
@@ -186,7 +186,6 @@ configuration: ## Section
     ## Change this to 'production' if you wish to run a production environment.
     rails_environment: 'production'
 
-    # TODO check
     ## Write unicorn stderr and stdout log.
     stderr_log: 'log/unicorn-stderr.log'
     stdout_log: 'log/unicorn-stdout.log'
@@ -302,8 +301,8 @@ configuration: ## Section
     ## Set this to false to prevent people from signing up to your pod
     ## without an invitation. Note that this needs to be set to true
     ## (or commented out) to enable the first registration (you).
-    # TODO ynh settings?
-    #enable_registrations: true
+    # TODO ynh settings
+    enable_registrations: false
 
     ## Auto-follow on sign-up (default=true)
     ## Users will automatically follow a specified account on creation.
diff --git a/scripts/install b/scripts/install
index deedfec..e31c088 100755
--- a/scripts/install
+++ b/scripts/install
@@ -31,7 +31,6 @@ ynh_abort_if_errors
 
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
-is_public=$YNH_APP_ARG_IS_PUBLIC
 admin=$YNH_APP_ARG_ADMIN
 admin_password=$YNH_APP_ARG_ADMIN_PASSWORD
 admin_email=$(ynh_user_get_info --username=$admin --key=mail)
@@ -71,7 +70,6 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 ynh_script_progression --message="Saving app settings..." --time --weight=1
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
-ynh_app_setting_set --app=$app --key=is_public --value=$is_public
 ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 
 #=================================================
@@ -213,25 +211,18 @@ ynh_use_logrotate
 #=================================================
 # ADVERTISE SERVICE IN ADMIN PANEL
 #=================================================
-yunohost service add $app --log "$final_path/diaspora/log/production.log" \
-  --log "$final_path/diaspora/log/sidekiq.log"\
-  --log "$final_path/diaspora/log/unicorn-stderr.log"\
-  --log "$final_path/diaspora/log/unicorn-stdout.log"
+yunohost service add $app.target\
+  --log $final_path/diaspora/log/production.log -t file\
+  --log $final_path/diaspora/log/unicorn-stderr.log -t file\
+  --log $final_path/diaspora/log/unicorn-stdout.log -t file\
+  --log $final_path/diaspora/log/sidekiq.log -t file\
+  --description "Diaspora service (unicorn web and sidekiq)"
 
 #=================================================
 # SETUP SSOWAT
 #=================================================
-
-if [ $is_public -eq 0 ]
-then	# Remove the public access
-	ynh_app_setting_delete $app skipped_uris
-fi
-# Make app public if necessary
-if [ $is_public -eq 1 ]
-then
-	# unprotected_uris allows SSO credentials to be passed anyway.
-	ynh_app_setting_set $app unprotected_uris "/"
-fi
+# unprotected_uris allows SSO credentials to be passed anyway.
+ynh_app_setting_set $app unprotected_uris "/"
 
 #=================================================
 # RELOAD NGINX