From 19a414c24c5635758566923514526f69ed02fd4c Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Thu, 16 Jun 2022 15:09:57 +0200
Subject: [PATCH] Fix #115

---
 conf/discourse_defaults.conf | 2 +-
 manifest.json                | 2 +-
 scripts/install              | 1 +
 scripts/upgrade              | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/conf/discourse_defaults.conf b/conf/discourse_defaults.conf
index 3db508b..9747b30 100644
--- a/conf/discourse_defaults.conf
+++ b/conf/discourse_defaults.conf
@@ -193,7 +193,7 @@ connection_reaper_interval = 30
 # set to relative URL (for subdirectory hosting)
 # IMPORTANT: path must not include a trailing /
 # EG: /forum
-relative_url_root = "__PATH__"
+relative_url_root = "__RELATIVE_URL_ROOT__"
 
 # increasing this number will increase redis memory use
 # this ensures backlog (ability of channels to catch up are capped)
diff --git a/manifest.json b/manifest.json
index 77e7e71..89849f8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Discussion platform",
         "fr": "Plateforme de discussion"
     },
-    "version": "2.7.13~ynh3",
+    "version": "2.7.13~ynh4",
     "url": "http://Discourse.org",
     "upstream": {
         "license": "GPL-2.0",
diff --git a/scripts/install b/scripts/install
index 2839254..e333997 100644
--- a/scripts/install
+++ b/scripts/install
@@ -140,6 +140,7 @@ ynh_script_progression --message="Adding a configuration file..."
 admin_mail=$(ynh_user_get_info --username=$admin --key=mail)
 redis_db=$(ynh_redis_get_free_db)
 ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db"
+relative_url_root=${path_url%/}
 
 ynh_add_config --template="../conf/discourse_defaults.conf" --destination="$final_path/config/discourse.conf"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index cd7476a..98e771a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -206,6 +206,7 @@ then
 	ynh_script_progression --message="Updating a config file..."
 
 	admin_mail=$(ynh_user_get_info --username=$admin --key=mail)
+	relative_url_root=${path_url%/}
 	ynh_add_config --template="../conf/discourse_defaults.conf" --destination="$final_path/config/discourse.conf"
 
 	ynh_add_config --template="../conf/settings.yml" --destination="$final_path/plugins/discourse-ldap-auth/config/settings.yml"