From 12a7d70520d90d687f28ac53bda05dee2a0c95fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 7 Dec 2023 11:11:05 +0100
Subject: [PATCH] cleaning

---
 conf/config.php    | 4 ++--
 manifest.toml      | 2 +-
 scripts/change_url | 3 ++-
 scripts/install    | 2 --
 scripts/restore    | 2 +-
 scripts/upgrade    | 1 -
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/conf/config.php b/conf/config.php
index 62098ea..0ca7c28 100644
--- a/conf/config.php
+++ b/conf/config.php
@@ -15,7 +15,7 @@
 	// *** Basic settings (important!) ***
 	// ***********************************
 
-	putenv('TTRSS_SELF_URL_PATH=__DOMAIN_PATH__');
+	putenv('TTRSS_SELF_URL_PATH=https://__DOMAIN____PATH__');
 	// Full URL of your tt-rss installation. This should be set to the
 	// location of tt-rss directory, e.g. http://example.org/tt-rss/
 	// You need to set this option correctly otherwise several features
@@ -177,7 +177,7 @@
 	// Disabling auth_internal in this list would automatically disable
 	// reset password link on the login form.
 	
-	putenv('TTRSS_LOG_DESTINATION=sql');
+	putenv('TTRSS_LOG_DESTINATION=syslog');
 	// Log destination to use. Possible values: sql (uses internal logging
 	// you can read in Preferences -> System), syslog - logs to system log.
 	// Setting this to blank uses PHP logging (usually to http server 
diff --git a/manifest.toml b/manifest.toml
index c04377b..05167bc 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -17,7 +17,7 @@ admindoc = "https://tt-rss.org/wiki.php"
 code = "https://gitlab.tt-rss.org/tt-rss/tt-rss"
 
 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.8"
 architectures = "all"
 multi_instance = true
 
diff --git a/scripts/change_url b/scripts/change_url
index fb1351f..88f1770 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -32,8 +32,9 @@ ynh_change_url_nginx_config
 #=================================================
 ynh_script_progression --message="Updating a configuration file..." --weight=1
 
-domain_path="https://${new_domain}${new_path}"
 domain="$new_domain"
+path="$new_path"
+
 ynh_add_config --template="config.php" --destination="$install_dir/config.php"
 
 chmod 400 "$install_dir/config.php"
diff --git a/scripts/install b/scripts/install
index 9303b62..348a544 100644
--- a/scripts/install
+++ b/scripts/install
@@ -44,8 +44,6 @@ yunohost service add $app --description="News feed reader and aggregator" --log=
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-domain_path=https://$domain$path
-
 ynh_add_config --template="config.php" --destination="$install_dir/config.php"
 
 chmod 400 "$install_dir/config.php"
diff --git a/scripts/restore b/scripts/restore
index 811a2b0..35a82eb 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -30,7 +30,7 @@ ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./d
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=50
+ynh_script_progression --message="Restoring system configurations related to $app..." --weight=5
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 0797a0c..3d6e3e3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -75,7 +75,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Updating a configuration file..." --weight=2
 
-	domain_path=https://$domain$path
 	ynh_add_config --template="config.php" --destination="$install_dir/config.php"
 
 	ynh_script_progression --message="Upgrading the database..." --weight=2