From ab1af6ca2acf682eddb1564394831b59849253b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Tue, 30 Jan 2024 10:39:18 +0100
Subject: [PATCH] Rename binaries to simplify systemd services

---
 conf/loki.service     | 2 +-
 conf/promtail.service | 2 +-
 scripts/install       | 4 ++++
 scripts/upgrade       | 4 ++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/conf/loki.service b/conf/loki.service
index cc7e031..6195ba1 100644
--- a/conf/loki.service
+++ b/conf/loki.service
@@ -7,7 +7,7 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
-ExecStart=/bin/bash -c '__INSTALL_DIR__/loki-linux-__ARCH__ --config.file <(/bin/bash __INSTALL_DIR__/merge_yaml.sh /etc/__APP__/loki-default.yaml /etc/__APP__/loki.d/*.y{a,}ml)'
+ExecStart=/bin/bash -c '__INSTALL_DIR__/loki --config.file <(/bin/bash __INSTALL_DIR__/merge_yaml.sh /etc/__APP__/loki-default.yaml /etc/__APP__/loki.d/*.y{a,}ml)'
 StandardOutput=append:/var/log/__APP__/loki.log
 StandardError=inherit
 
diff --git a/conf/promtail.service b/conf/promtail.service
index 6d5c036..041f70f 100644
--- a/conf/promtail.service
+++ b/conf/promtail.service
@@ -7,7 +7,7 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
-ExecStart=/bin/bash -c '__INSTALL_DIR__/promtail-linux-__ARCH__ --config.file <(/bin/bash __INSTALL_DIR__/merge_yaml.sh /etc/__APP__/promtail-default.yaml /etc/__APP__/promtail.d/*.y{a,}ml)'
+ExecStart=/bin/bash -c '__INSTALL_DIR__/promtail --config.file <(/bin/bash __INSTALL_DIR__/merge_yaml.sh /etc/__APP__/promtail-default.yaml /etc/__APP__/promtail.d/*.y{a,}ml)'
 StandardOutput=append:/var/log/__APP__/promtail.log
 StandardError=inherit
 
diff --git a/scripts/install b/scripts/install
index 991d2f7..eee32e4 100755
--- a/scripts/install
+++ b/scripts/install
@@ -17,6 +17,10 @@ ynh_script_progression --message="Setting up source files..." --weight=1
 ynh_setup_source --dest_dir="$install_dir" --source_id="loki"
 ynh_setup_source --dest_dir="$install_dir" --source_id="promtail"
 
+# Rename the binaries to remove arch
+mv "$install_dir"/loki-linux-* "$install_dir"/loki
+mv "$install_dir"/promtail-linux-* "$install_dir"/promtail
+
 chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R "$app:www-data" "$install_dir"
diff --git a/scripts/upgrade b/scripts/upgrade
index 2714ee9..c13f548 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -28,6 +28,10 @@ ynh_script_progression --message="Upgrading source files..." --weight=1
 ynh_setup_source --dest_dir="$install_dir" --source_id="loki" --full_replace=1
 ynh_setup_source --dest_dir="$install_dir" --source_id="promtail"
 
+# Rename the binaries to remove arch
+mv "$install_dir"/loki-linux-* "$install_dir"/loki
+mv "$install_dir"/promtail-linux-* "$install_dir"/promtail
+
 chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R "$app:www-data" "$install_dir"