From cb41e1e49fec45d98a19ce8b28cf7551abeb095f Mon Sep 17 00:00:00 2001
From: Oliver <oliver@odoo4projects.com>
Date: Sat, 16 Aug 2025 14:53:15 +0200
Subject: [PATCH] working

---
 alpine/template                  |  2 +-
 app/templates/docker-compose.yml |  2 +-
 app/templates/init.d/4server-api |  9 ++++++++-
 app/update                       | 13 +++++++++----
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/alpine/template b/alpine/template
index 390a71b..dc3e164 100755
--- a/alpine/template
+++ b/alpine/template
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ "$#" -ne 3 ]; then
+if [ "$#" -ne 2 ]; then
   echo "Usage: $0 <localfile> <remotefile>"
   exit 1
 fi
diff --git a/app/templates/docker-compose.yml b/app/templates/docker-compose.yml
index 7783d86..6616855 100644
--- a/app/templates/docker-compose.yml
+++ b/app/templates/docker-compose.yml
@@ -23,7 +23,7 @@ services:
       - 8080:8080
     volumes:
       - /run/docker.sock:/run/docker.sock:ro
-      - /4server/data/traefik/config/traefik/etc:/etc/traefik
+      - /4server/data/traefik/etc:/etc/traefik
       - /4server/data/traefik/certs:/certs
       - /4server/data/traefik/traefik-logs:/var/log/traefik
     networks:
diff --git a/app/templates/init.d/4server-api b/app/templates/init.d/4server-api
index 56285da..758ffff 100755
--- a/app/templates/init.d/4server-api
+++ b/app/templates/init.d/4server-api
@@ -3,11 +3,19 @@
 name="4server-api"
 description="4server API Service"
 
+# Command uses Python inside the venv
 command="/4server/sbin/api"
 command_args=""
 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)
+fi
+
+# Logs
 output_log="/4server/data/api.log"
 error_log="/4server/data/api.log"
 
@@ -17,4 +25,3 @@ depend() {
     after firewall
 }
 
-
diff --git a/app/update b/app/update
index 4d45159..2809994 100755
--- a/app/update
+++ b/app/update
@@ -10,7 +10,12 @@ template templates/hosts /etc/hosts
 ### PACKAGES
 template templates/repositories /etc/apk/repositories            
 rex doas apk update && upgrade
-rex doas apk add jq rsync mc vim docker docker-compose htop linux-lts sqlite bash postgresql-16-client
+rex doas apk add python3 build-base python3-dev linux-headers py3-pip gcc g++ musl-dev libffi-dev make jq rsync mc vim docker docker-compose htop linux-lts sqlite bash postgresql16-client
+
+rex doas pip install  --break-system-packages --no-cache-dir "uvicorn[standard]" fastapi pydantic psutil
+
+
+
 
 ### own bins
 prsync -h "$hosts_file" -avz ./sbin/ /4server/sbin/
@@ -35,12 +40,12 @@ rex doas rc-update add docker boot
 
 
 
-rex mkdir -p /4server/data/treafik/config/
-template templates/traefik.yaml /4server/data/traefik/config/traefik.yaml
+rex mkdir -p /4server/data/traefik/etc
+template templates/traefik.yaml /4server/data/traefik/etc/traefik.yaml
 
 rex mkdir -p /4server/data/traefik/etc/certs
 prsync -h "$hosts_file" -avz  ./etc/certs/* /4server/data/traefik/etc/certs/
 
 template templates/docker-compose.yml /4server/docker-compose.yml 
-rex doas docker-compose -f /4server/docker-compose.yml up -d
+rex doas docker-compose -f /4server/docker-compose.yml up -d --force-recreate