From aee2bc28e3b476654946913813e2321da8f6dc26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 23 Jun 2022 15:32:27 +0200
Subject: [PATCH] Fix

---
 conf/config.json | 4 ++--
 scripts/install  | 4 +---
 scripts/upgrade  | 7 -------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/conf/config.json b/conf/config.json
index 6ca3a3f..dffd943 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -90,7 +90,7 @@
     "EnableInlineLatex": true,
     "EnableAPIChannelDeletion": false,
     "EnableLocalMode": true,
-    "LocalModeSocketLocation": "__LOCAL_SOCKET_PATH__",
+    "LocalModeSocketLocation": "/var/run/__APP__/mattermost_local.socket",
     "EnableAWSMetering": false,
     "SplitKey": "",
     "FeatureFlagSyncIntervalSeconds": 30,
@@ -177,7 +177,7 @@
     "EnableFile": true,
     "FileLevel": "INFO",
     "FileJson": true,
-    "FileLocation": "__LOGS_PATH__",
+    "FileLocation": "/var/log/__APP__",
     "AdvancedLoggingConfig": ""
   },
   "PasswordSettings": {
diff --git a/scripts/install b/scripts/install
index 94ee558..e92bce4 100644
--- a/scripts/install
+++ b/scripts/install
@@ -136,8 +136,7 @@ ynh_script_progression --message="Configuring log rotation..." --weight=1
 # Create log directory
 mkdir -p /var/log/$app
 #touch /var/log/$app/$app.log
-logs_path="/var/log/$app"
-chown $app -R $logs_path
+chown $app -R "/var/log/$app"
 
 # Setup logrotate
 ynh_use_logrotate
@@ -151,7 +150,6 @@ ynh_script_progression --message="Modifying a config file..." --weight=3
 
 smtp_user_pwd=$(ynh_string_random --length=24)
 url=https://$domain$path_url
-local_socket_path="/var/run/${app}/mattermost_local.socket"
 
 ynh_add_config --template="../conf/config.json" --destination="$final_path/config/config.json"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 19bd02f..6d43ab9 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -174,7 +174,6 @@ ynh_script_progression --message="Updating a configuration file..." --weight=3
 
 smtp_user_pwd=$(ynh_string_random --length=24)
 url=https://$domain$path_url
-local_socket_path="/var/run/${app}/mattermost_local.socket"
 
 ynh_add_config --template="../conf/config.json" --destination="$final_path/config/config.json"
 
@@ -206,12 +205,6 @@ yunohost service add $app --description="Collaboration platform built for develo
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=2
 
-# A lengthy database migration runs when upgrading from a version < 6.0.
-if dpkg --compare-versions "$previous_upstream_version" lt "6.0.0"
-then
-  ynh_print_warn --message="Lengthy database migrations will now run. This may take a while..."
-fi
-
 # Start a systemd service
 ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Started Mattermost"