From 2578d12ea47d10130472a845244e4aaac48897cb Mon Sep 17 00:00:00 2001
From: RATDAD <lambda@disroot.org>
Date: Fri, 6 Mar 2026 02:05:52 -0500
Subject: checkpoint: development state

---
 stacks/db/.gitignore       |  2 +-
 stacks/db/compose.yml      | 28 ++++++++++++++++++----------
 stacks/db/env.example      | 16 ----------------
 stacks/db/env.template     | 17 +++++++++++++++++
 stacks/db/run.env.example  | 11 -----------
 stacks/db/run.env.template | 11 +++++++++++
 6 files changed, 47 insertions(+), 38 deletions(-)
 delete mode 100644 stacks/db/env.example
 create mode 100644 stacks/db/env.template
 delete mode 100644 stacks/db/run.env.example
 create mode 100644 stacks/db/run.env.template

(limited to 'stacks/db')

diff --git a/stacks/db/.gitignore b/stacks/db/.gitignore
index 31c0c95..13fed15 100644
--- a/stacks/db/.gitignore
+++ b/stacks/db/.gitignore
@@ -1,3 +1,3 @@
 *.env
-password
+data/
 compose.test.yml
diff --git a/stacks/db/compose.yml b/stacks/db/compose.yml
index b7227d1..9a44712 100644
--- a/stacks/db/compose.yml
+++ b/stacks/db/compose.yml
@@ -1,28 +1,35 @@
-name: ${_STACK_0}
+name: ${STACK}
 
 networks:
-  db-net:
-    name: ${_NET_0}
-    external: true
   edge-net:
-    name: ${_NET_1}
+    name: ${EDGE_NET}
+    external: true
+  db-net:
+    name: ${DB_NET}
     external: true
 
 volumes:
   db-data:
-    name: ${_VOLUME_0}
+    name: ${DB_VOLUME}
     external: true
 
+secrets:
+  DB_PASSWORD:
+    file: '/srv/secrets/DB_PASSWORD'
+
 services:
-  db-test:
-    container_name: ${_CONTAINER_0}
+  db:
+    container_name: ${DB_CONTAINER}
     image: postgres:16
     restart: unless-stopped
+    environment:
+      POSTGRES_USER: 'admin'
     env_file:
       - .run.env # Runtime ENV
       - .env # Compose ENV
+    user: '${UID}:${GID}'
     volumes:
-      - db-data:/var/lib/postgresql/data
+      - ./data/:/var/lib/postgresql/data
     networks:
       - db-net
     expose:
@@ -32,9 +39,10 @@ services:
       interval: 5s
       retries: 5
   db-admin:
-    container_name: ${_CONTAINER_1}
+    container_name: ${DBA_CONTAINER}
     image: adminer:latest
     env_file:
+      - .run.env
       - .env
     depends_on:
       - db-test
diff --git a/stacks/db/env.example b/stacks/db/env.example
deleted file mode 100644
index 05092c2..0000000
--- a/stacks/db/env.example
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-#
-# Stack Compose Variables
-
-# Namespaces
-_STACK_0=
-
-# Containers
-_CONTAINER_0=
-
-# Network
-_NET_0=
-_NET_1=
-
-# Volumes
-_VOLUME_0=
diff --git a/stacks/db/env.template b/stacks/db/env.template
new file mode 100644
index 0000000..cad7ccb
--- /dev/null
+++ b/stacks/db/env.template
@@ -0,0 +1,17 @@
+#
+#
+# Stack Compose Variables
+
+# Namespace
+STACK=
+
+# Containers
+DB_CONTAINER=
+DBA_CONTAINER=
+
+# Networks
+EDGE_NET=
+DB_NET=
+
+# Volumes
+DB_CONTAINER=
diff --git a/stacks/db/run.env.example b/stacks/db/run.env.example
deleted file mode 100644
index b7371f5..0000000
--- a/stacks/db/run.env.example
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-#
-# Stack Runtime Variables
-
-# PostgreSQL
-POSTGRES_USER=
-POSTGRES_PASSWORD=
-
-# Adminer
-ADMINER_DEFAULT_SERVER=
-ADMINER_DESIGN=mancave
diff --git a/stacks/db/run.env.template b/stacks/db/run.env.template
new file mode 100644
index 0000000..b5f8727
--- /dev/null
+++ b/stacks/db/run.env.template
@@ -0,0 +1,11 @@
+#
+#
+# Stack Runtime Variables
+
+# PostgreSQL
+POSTGRES_USER=
+POSTGRES_PASSWORD=
+
+# Adminer
+ADMINER_DEFAULT_SERVER=
+ADMINER_DESIGN=galkaev
-- 
cgit v1.2.3-70-g09d2