First stage refactor for dynamic app specs (napps.scm).

2026-07-02 19:39:56 -07:00
parent 868e00ac41
commit 04407b16b0
49 changed files with 420 additions and 253 deletions
--- a/all-apps/dozzle/20/docker-compose.yaml
+++ b/all-apps/dozzle/20/docker-compose.yaml
--- a/all-apps/ghost/6/.compose.env.tmpl
+++ b/all-apps/ghost/6/.compose.env.tmpl
--- a/all-apps/ghost/6/docker-compose.yaml
+++ b/all-apps/ghost/6/docker-compose.yaml
--- a/all-apps/instance-control/b0.0.1/docker-compose.yaml
+++ b/all-apps/instance-control/b0.0.1/docker-compose.yaml
--- a/all-apps/instance-control/b0.0.1/hooks/hooks.json.tmpl
+++ b/all-apps/instance-control/b0.0.1/hooks/hooks.json.tmpl
--- a/all-apps/instance-control/b0.0.1/hooks/queue-restic-snapshot-no-restart.sh
+++ b/all-apps/instance-control/b0.0.1/hooks/queue-restic-snapshot-no-restart.sh
--- a/all-apps/instance-control/b0.0.1/hooks/queue-restic-snapshot.sh
+++ b/all-apps/instance-control/b0.0.1/hooks/queue-restic-snapshot.sh
--- a/all-apps/instance-control/b0.0.1/hooks/restic-snapshot-status.sh
+++ b/all-apps/instance-control/b0.0.1/hooks/restic-snapshot-status.sh
--- a/all-apps/nassella/b0.0.1/authelia-config/configuration.yml.tmpl
+++ b/all-apps/nassella/b0.0.1/authelia-config/configuration.yml.tmpl
--- a/all-apps/nassella/b0.0.1/authelia_postgres_db
+++ b/all-apps/nassella/b0.0.1/authelia_postgres_db
--- a/all-apps/nassella/b0.0.1/authelia_postgres_password
+++ b/all-apps/nassella/b0.0.1/authelia_postgres_password
--- a/all-apps/nassella/b0.0.1/authelia_postgres_user
+++ b/all-apps/nassella/b0.0.1/authelia_postgres_user
--- a/all-apps/nassella/b0.0.1/docker-compose.yaml
+++ b/all-apps/nassella/b0.0.1/docker-compose.yaml
--- a/all-apps/nassella/b0.0.1/lldap-config/lldap_config.toml.tmpl
+++ b/all-apps/nassella/b0.0.1/lldap-config/lldap_config.toml.tmpl
--- a/all-apps/nassella/b0.0.1/lldap_admin_password
+++ b/all-apps/nassella/b0.0.1/lldap_admin_password
--- a/all-apps/nassella/b0.0.1/lldap_postgres_db
+++ b/all-apps/nassella/b0.0.1/lldap_postgres_db
--- a/all-apps/nassella/b0.0.1/lldap_postgres_password
+++ b/all-apps/nassella/b0.0.1/lldap_postgres_password
--- a/all-apps/nassella/b0.0.1/lldap_postgres_user
+++ b/all-apps/nassella/b0.0.1/lldap_postgres_user
--- a/all-apps/nassella/b0.0.1/nassella.env
+++ b/all-apps/nassella/b0.0.1/nassella.env
--- a/all-apps/nassella/b0.0.1/postgres_db
+++ b/all-apps/nassella/b0.0.1/postgres_db
--- a/all-apps/nassella/b0.0.1/postgres_password
+++ b/all-apps/nassella/b0.0.1/postgres_password
--- a/all-apps/nassella/b0.0.1/postgres_user
+++ b/all-apps/nassella/b0.0.1/postgres_user
--- a/all-apps/nassella/b0.0.1/stripe_api_key
+++ b/all-apps/nassella/b0.0.1/stripe_api_key
--- a/all-apps/nextcloud/34/docker-compose.yaml
+++ b/all-apps/nextcloud/34/docker-compose.yaml
--- a/all-apps/nextcloud/34/nextcloud.env
+++ b/all-apps/nextcloud/34/nextcloud.env
@@ -0,0 +1,20 @@
+DOMAIN="nextcloud.nassella.cc"
+NEXTCLOUD_TRUSTED_DOMAINS=${DOMAIN}
+
+# reverse proxy config
+OVERWRITEHOST=${DOMAIN}
+OVERWRITECLIURL=https://${DOMAIN}
+OVERWRITEPROTOCOL=https
+TRUSTED_PROXIES=172.16.0.0/24 # trust the local lb
+PHP_MEMORY_LIMIT=1G
+PHP_UPLOAD_LIMIT=10G
+POSTGRES_HOST=db
+POSTGRES_DB_FILE=/run/secrets/postgres_db
+POSTGRES_USER_FILE=/run/secrets/postgres_user
+POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+# admin user
+NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/nextcloud_admin_password
+NEXTCLOUD_ADMIN_USER_FILE=/run/secrets/nextcloud_admin_user
+# redis
+REDIS_HOST=redis
+REDIS_HOST_PASSWORD_FILE=/run/secrets/redis_password
--- a/all-apps/nextcloud/34/nextcloud.env.tmpl
+++ b/all-apps/nextcloud/34/nextcloud.env.tmpl
--- a/all-apps/nextcloud/34/nextcloud_admin_password
+++ b/all-apps/nextcloud/34/nextcloud_admin_password
@@ -0,0 +1 @@
+foodisgood
--- a/all-apps/nextcloud/34/nextcloud_admin_user
+++ b/all-apps/nextcloud/34/nextcloud_admin_user
@@ -0,0 +1 @@
+admin
--- a/all-apps/nextcloud/34/postgres_db
+++ b/all-apps/nextcloud/34/postgres_db
@@ -0,0 +1 @@
+nextcloud
--- a/all-apps/nextcloud/34/postgres_password
+++ b/all-apps/nextcloud/34/postgres_password
@@ -0,0 +1 @@
+dbpassword
--- a/all-apps/nextcloud/34/postgres_user
+++ b/all-apps/nextcloud/34/postgres_user
@@ -0,0 +1 @@
+nextcloud
--- a/all-apps/nextcloud/34/redis_password
+++ b/all-apps/nextcloud/34/redis_password
@@ -0,0 +1 @@
+redispassword
--- a/all-apps/nextcloud/napp.scm
+++ b/all-apps/nextcloud/napp.scm
@@ -0,0 +1,25 @@
+((name . "Nextcloud")
+ (key . nextcloud)
+ (dir . "nextcloud")
+ (current-version . "34")
+ (versions . (("34")))
+ (website . "https://nextcloud.com")
+ (docker-secrets . (("NEXTCLOUD_ADMIN_USER" "nextcloud_admin_user")
+                    ("NEXTCLOUD_ADMIN_PASSWORD" "nextcloud_admin_password")
+                    ("NEXTCLOUD_POSTGRES_DB" "postgres_db")
+                    ("NEXTCLOUD_POSTGRES_USER" "postgres_user")
+                    ("NEXTCLOUD_POSTGRES_PASSWORD" "postgres_password")
+                    ("NEXTCLOUD_REDIS_PASSWORD" "redis_password")))
+ (scripts . (("make-nextcloud-env.sh"
+              ((deps . ("nextcloud.env.tmpl"))
+               (output . "nextcloud.env")))))
+ (apps-config . (("NEXTCLOUD_ADMIN_USER" admin-user)
+                 ("NEXTCLOUD_ADMIN_PASSWORD" admin-password)
+                 ("NEXTCLOUD_POSTGRES_DB" "nextcloud")
+                 ("NEXTCLOUD_POSTGRES_USER" "nextcloud")
+                 ("NEXTCLOUD_POSTGRES_PASSWORD" postgres-password)
+                 ("NEXTCLOUD_REDIS_PASSWORD" redis-password)))
+ (general . ((smtp . #t)))
+ (caddyfile . "  reverse_proxy http://nextcloud:80")
+ (passwd . ((name . "nextcloud")
+            (uid . "1001"))))
--- a/all-apps/wg-easy/15/docker-compose.yaml
+++ b/all-apps/wg-easy/15/docker-compose.yaml
--- a/all-apps/wg-easy/napp.scm
+++ b/all-apps/wg-easy/napp.scm
@@ -0,0 +1,7 @@
+((name . "wg-easy")
+ (key . wg-easy)
+ (dir . "wg-easy")
+ (current-version . "15")
+ (versions . (("15")))
+ (website . "https://wg-easy.github.io/wg-easy/Pre-release/")
+ (caddyfile . "  reverse_proxy http://wg-easy:80"))