From 269ab1f4c2b58f79c3c7118cb26417e5ad5e17b9 Mon Sep 17 00:00:00 2001
From: Christian Pierre MOMON <cmomon@april.org>
Date: Thu, 12 Nov 2020 01:25:37 +0100
Subject: [PATCH] Improved configuration file management.

---
 rapport_activite/rapport_activite.sh      | 2 +-
 rapport_activite/update_redmine_ticket.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rapport_activite/rapport_activite.sh b/rapport_activite/rapport_activite.sh
index 62dff2b..e199058 100755
--- a/rapport_activite/rapport_activite.sh
+++ b/rapport_activite/rapport_activite.sh
@@ -26,7 +26,7 @@ LOG_PREFIX="/var/log/apache2/forge.chapril.org/forge.chapril.org"
 SERVICE_NAME="forge.chapril.org"
 GITEA_REPO_HOME="/srv/gitea/repositories/"
 
-source "/etc/chagirbot/chagirbot.conf"
+source "/etc/forge.chapril.org/forgechaprilorg.conf"
 
 IPV4_PATTERN="[0-9]{1,3}(\.[0-9]{1,3}){3}"
 IPV6_PATTERN="[0-9a-f]{0,4}(:[0-9a-f]{0,4}){2,7}"
diff --git a/rapport_activite/update_redmine_ticket.sh b/rapport_activite/update_redmine_ticket.sh
index 9d09877..025dfe2 100755
--- a/rapport_activite/update_redmine_ticket.sh
+++ b/rapport_activite/update_redmine_ticket.sh
@@ -1,8 +1,8 @@
 #! /bin/bash
 
 SCRIPT="/srv/forge.chapril.org/tools/rapport_activite/rapport_activite.sh"
-CONFIG="/etc/chagirbot/chagirbot.conf"
-source ${CONFIG}
+source "/etc/chagirbot/chagirbot.conf"
+source "/etc/forge.chapril.org/forgechaprilorg.conf"
 
 #
 post_report()