From dd9729f9daa71aa09b63294f3468be48175f79fc Mon Sep 17 00:00:00 2001
From: spinach <spinach@spin.ach>
Date: Sat, 1 Mar 2025 11:20:10 -0500
Subject: [PATCH] fixing the env vars refs

---
 bin/init.py                |  2 +-
 caddy/docker-compose.yml   |  1 -
 gitea/docker-compose.yml   | 11 +++++------
 gitea/env                  |  4 ++--
 seafile/docker-compose.yml |  4 ++--
 seafile/env                | 22 ----------------------
 6 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/bin/init.py b/bin/init.py
index 25db127..5850419 100755
--- a/bin/init.py
+++ b/bin/init.py
@@ -94,7 +94,7 @@ def gen_env(kv):
     """
     env = ""
     for key, value in kv.items():
-        env += f"{key}=\"{value}\"\n"
+        env += f"{key}='{value}'\n"
 
     return env
 
diff --git a/caddy/docker-compose.yml b/caddy/docker-compose.yml
index 0bad524..7e905d6 100644
--- a/caddy/docker-compose.yml
+++ b/caddy/docker-compose.yml
@@ -7,7 +7,6 @@ services:
     ports:
       - "80:80"
       - "443:443"
-      - "443:443/udp"
     networks:
       - caddy
     volumes:
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index 42e20e2..de03816 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -20,11 +20,11 @@ services:
     ports:
       - "127.0.0.1:2222:22"
     depends_on:
-      - postgres-gitea
+      - postgres
 
-  postgres-gitea:
+  postgres:
     image: postgres:17
-    restart: always
+    restart: unless-stopped
     env_file: "priv/env"
     networks:
       - gitea
@@ -35,7 +35,6 @@ networks:
   gitea:
     external: false
   caddy:
-    external: 
-      name: caddy_caddy
+    external: true
+    name: caddy_caddy
     driver: bridge
-
diff --git a/gitea/env b/gitea/env
index 3e3fd30..3dc62b2 100644
--- a/gitea/env
+++ b/gitea/env
@@ -6,6 +6,6 @@ GITEA__database__USER="gitea"
 GITEA__database__PASSWD=""
 
 ## Postgresql Settings
-POSTGRES_USER="$GITEA__database__USER"
+POSTGRES_USER="gitea"
+POSTGRES_DB="gitea"
 POSTGRES_PASSWORD="$GITEA__database__PASSWD"
-POSTGRES_DB="$GITEA__database__NAME"
diff --git a/seafile/docker-compose.yml b/seafile/docker-compose.yml
index a6e832f..195f817 100644
--- a/seafile/docker-compose.yml
+++ b/seafile/docker-compose.yml
@@ -50,6 +50,6 @@ networks:
   seafile:
     external: false
   caddy:
-    external:
-      name: caddy_caddy
+    external: true
+    name: caddy_caddy
     driver: bridge
diff --git a/seafile/env b/seafile/env
index e69d48a..7f7c5a0 100644
--- a/seafile/env
+++ b/seafile/env
@@ -3,10 +3,6 @@ MYSQL_ROOT_PASSWORD=""
 MYSQL_LOG_CONSOLE="true"
 MARIADB_AUTO_UPGRADE=1
 
-## Seafile Settings
-# COMPOSE_FILE='seafile-server.yml,caddy.yml,seadoc.yml'
-# COMPOSE_PATH_SEPARATOR=','
-
 TIME_ZONE="America/New_York"
 
 SEAFILE_VOLUME="volumes/seafile/data"
@@ -26,21 +22,3 @@ INIT_SEAFILE_ADMIN_EMAIL=""
 INIT_SEAFILE_ADMIN_PASSWORD=""
 
 ENABLE_SEADOC=false
-
-# SEAFILE_VOLUME="volumes/seafile/data"
-# SEAFILE_CADDY_VOLUME="volumes/caddy/data"
-
-# DB_ROOT_PASSWORD="$MYSQL_ROOT_PASSWORD"
-# SEAFILE_MYSQL_DB_HOST="mariadb"
-# SEAFILE_MYSQL_DB_USER="seafile"
-# SEAFILE_MYSQL_DB_PASSWORD=""
-
-# SEAFILE_JWT_PRIVATE_KEY=""
-
-# SEAFILE_SERVER_HOSTNAME=""
-# SEAFILE_SERVER_PROTOCOL="https"
-
-# INIT_SEAFILE_ADMIN_EMAIL=""
-# INIT_SEAFILE_ADMIN_PASSWORD=""
-
-# ENABLE_SEADOC=false