From 7d0f1967b31051012e83f35668adeee342445a2e Mon Sep 17 00:00:00 2001 From: Oliver Date: Sat, 30 Aug 2025 10:29:36 +0200 Subject: [PATCH] working --- app/templates/4server | 2 +- app/templates/init.d/{4server-api => api} | 8 ++++---- app/update | 14 ++++++++------ app/vault/host_vars.img | Bin 26214400 -> 26214400 bytes 4 files changed, 13 insertions(+), 11 deletions(-) rename app/templates/init.d/{4server-api => api} (79%) diff --git a/app/templates/4server b/app/templates/4server index 473e62b..6dd8490 100644 --- a/app/templates/4server +++ b/app/templates/4server @@ -1 +1 @@ -API_KEY={API_KEY} +API_KEY={{API_KEY}} diff --git a/app/templates/init.d/4server-api b/app/templates/init.d/api similarity index 79% rename from app/templates/init.d/4server-api rename to app/templates/init.d/api index 4799b56..7df9d59 100755 --- a/app/templates/init.d/4server-api +++ b/app/templates/init.d/api @@ -1,6 +1,6 @@ #!/sbin/openrc-run -name="4server-api" +name="api" description="4server API Service" # Command uses Python inside the venv @@ -10,9 +10,9 @@ pidfile="/run/${RC_SVCNAME}.pid" command_background="yes" # Load environment variables if needed -if [ -f /etc/od8n ]; then - . /etc/od8n - export $(cut -d= -f1 /etc/od8n) +if [ -f /etc/4server ]; then + . /etc/4server + export $(cut -d= -f1 /etc/4server) fi # Logs diff --git a/app/update b/app/update index bfc1153..b91e50b 100755 --- a/app/update +++ b/app/update @@ -24,14 +24,16 @@ prsync -h "/app/host_vars/hosts" -avz ./sbin/ /4server/sbin/ ### API #INSTALL API KEYS -template templates/4server /etc/4server +template templates/4server /etc/4server +rex doas chown root:root /etc/4server +rex doas chmod 600 /etc/4server #INSTALL API SERVICE -template templates/init.d/4server-api /etc/init.d/4server-api -rex doas chmod 0755 /etc/init.d/4server-api -rex doas chown root:root /etc/init.d/4server-api -rex doas rc-update add 4server-api default -rex doas rc-service 4server-api restart +template templates/init.d/api /etc/init.d/api +rex doas chmod 0755 /etc/init.d/api +rex doas chown root:root /etc/init.d/api +rex doas rc-update add api default +rex doas rc-service api restart ### Infrastructure diff --git a/app/vault/host_vars.img b/app/vault/host_vars.img index b4578a21c4d3a623b3b8975e1054bbb006ed1232..ae9e2d33a99868c2499d8efc5d19b2f0818d9663 100644 GIT binary patch delta 3696 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 BfNB5$ delta 3696 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 z