From 1161382c444725eef83bd9e70e7c0c539b0c03a9 Mon Sep 17 00:00:00 2001
From: Benjamin Labrecque <labrecque.benji@gmail.com>
Date: Thu, 2 Jul 2026 08:28:06 +0200
Subject: [PATCH] chore: update start service script and systemd for master

---
 bin/start_service.sh                                  | 11 ++++++++---
 .../000-master/systemd/AGEBD-SERVICE-MASTER.service   |  7 +++----
 services/000-master/systemd/dev.env                   |  0
 services/000-master/systemd/prod.env                  |  0
 4 files changed, 11 insertions(+), 7 deletions(-)
 delete mode 100644 services/000-master/systemd/dev.env
 delete mode 100644 services/000-master/systemd/prod.env

diff --git a/bin/start_service.sh b/bin/start_service.sh
index e73cd1d..7f4001c 100644
--- a/bin/start_service.sh
+++ b/bin/start_service.sh
@@ -4,17 +4,22 @@ SVC_ID=$1
 SVC_NAME=$2
 ENV=$3
 set --
+# TODO:
 PSI_GFA_FACILITY=SLS
-HLA_DIR=/sls/bd/hla
-SVC_DIR=${HLA_DIR}/${ENV}/${SVC_ID}-${SVC_NAME}
 
-export EPICS_CA_ADDR_LIST='sls-cagw.psi.ch:5062 129.129.146.88'
+SERVICES_DIR=/sls/bd/hla/services
+SVC_NAME_LOWER=${SVC_NAME,,}
+SVC_DIR=${SERVICES_DIR}/${ENV}/${SVC_ID}-${SVC_NAME_LOWER}
+
 
 # gfa_12_epics.sh died on the 16.04.2026 due to required AFS write access
 #. /etc/profile.d/gfa_12_epics.sh
 #. /sls/bd/exchange/BeamData/user/felix/workarounds/epicsRHEL8.rc  # temporary fix
 . /etc/profile.d/cas_12_epics.sh
 
+# TODO: only for dev
+export EPICS_CA_ADDR_LIST='sls-cagw.psi.ch:5062 129.129.146.88'
+
 # activate conda environment
 . /opt/gfa/python-3.10/latest/bin/activate
 
diff --git a/services/000-master/systemd/AGEBD-SERVICE-MASTER.service b/services/000-master/systemd/AGEBD-SERVICE-MASTER.service
index 81e0de4..8bbd10d 100644
--- a/services/000-master/systemd/AGEBD-SERVICE-MASTER.service
+++ b/services/000-master/systemd/AGEBD-SERVICE-MASTER.service
@@ -1,11 +1,10 @@
 [Unit]
-Description=AGEBD-SERVICE-MASTER (%I Environment)
+Description=AGEBD-SERVICE-MASTER 
 After=network.target
 
 [Service]
-EnvironmentFile=/sls/bd/hla/%i/000-master/systemd/%i.env
-
-ExecStart=/sls/bd/exchange/BeamData/user/benjamin/bin/systemd/start MASTER
+Environment=AGEBD_ENV=dev
+ExecStart=/sls/bd/hla/bin/start_service.sh 000 MASTER
 Restart=no
 
 [Install]
diff --git a/services/000-master/systemd/dev.env b/services/000-master/systemd/dev.env
deleted file mode 100644
index e69de29..0000000
diff --git a/services/000-master/systemd/prod.env b/services/000-master/systemd/prod.env
deleted file mode 100644
index e69de29..0000000