From 1cc52ab7b5771ebcc16b4e8e6fb80f0cc66236ef Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 12 Jan 2021 21:12:34 +0100
Subject: [PATCH] New permissions

---
 check_process      |  1 -
 scripts/_common.sh |  2 +-
 scripts/install    |  7 ++++---
 scripts/restore    |  2 +-
 scripts/upgrade    | 14 +-------------
 5 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/check_process b/check_process
index 0d04182..abb7748 100644
--- a/check_process
+++ b/check_process
@@ -19,7 +19,6 @@
 		upgrade=1
 		backup_restore=1
 		multi_instance=0
-		incorrect_path=1
 		port_already_use=0
 		change_url=1
 ;;; Options
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 6003e8f..d556267 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,7 +5,7 @@
 #=================================================
 
 # dependencies used by the app
-pkg_dependencies="postgresql libstdc++6 redis-server rabbitmq-server libcurl4-dev"
+pkg_dependencies="postgresql postgresql-contrib libstdc++6 redis-server rabbitmq-server libcurl4-dev"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index 76817ab..54584de 100644
--- a/scripts/install
+++ b/scripts/install
@@ -72,7 +72,7 @@ ynh_install_extra_repo --repo="deb http://download.onlyoffice.com/repo/debian sq
 #=================================================
 ynh_script_progression --message="Installing dependencies..."
 
-ynh_install_app_dependencies $pkg_dependencies
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # CREATE A POSTGRESQL DATABASE
@@ -183,8 +183,9 @@ ynh_script_progression --message="Configuring SSOwat..."
 # 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=$app --key=unprotected_uris --value="/"
+	# Everyone can access the app.
+	# The "main" permission is automatically created before the install script.
+	ynh_permission_update --permission="main" --add="visitors"
 fi
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index fe66d64..aca2de5 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -74,7 +74,7 @@ ynh_install_extra_repo --repo="deb http://download.onlyoffice.com/repo/debian sq
 ynh_script_progression --message="Reinstalling dependencies..."
 
 # Define and install dependencies
-ynh_install_app_dependencies $pkg_dependencies
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # RESTORE THE POSTGRESQL DATABASE
diff --git a/scripts/upgrade b/scripts/upgrade
index 7bb238c..8a127ff 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -89,7 +89,7 @@ ynh_add_nginx_config "nextclouddomain"
 #=================================================
 ynh_script_progression --message="Upgrading dependencies..."
 
-ynh_install_app_dependencies $pkg_dependencies
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # CREATE DEDICATED USER
@@ -149,18 +149,6 @@ ynh_script_progression --message="Generating fonts..."
 
 #=================================================
 # GENERIC FINALIZATION
-#=================================================
-# SETUP SSOWAT
-#=================================================
-ynh_script_progression --message="Upgrading SSOwat configuration..."
-
-# 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=$app --key=unprotected_uris --value="/"
-fi
-
 #=================================================
 # RELOAD ONLYOFFICE
 #=================================================