Migrations infra & working instance-control + commands

This commit is contained in:
2026-05-23 20:53:44 -07:00
parent acdb4840aa
commit 348e1fa857
13 changed files with 262 additions and 62 deletions

View File

@@ -7,10 +7,11 @@ apps_config := $(config_dir)apps.config
# to only run if the contents of all-apps changes
app/.dirstamp: all-apps/app.service all-apps/docker-compose.yaml all-apps/.env \
all-apps/restic-snapshot.service \
all-apps/instance-control-webhooks/webhook_secret \
all-apps/instance-control/webhook_secret \
all-apps/instance-control/hooks/hooks.json \
all-apps/lb/Caddyfile \
$(wildcard all-apps/lb/*) \
$(wildcard all-apps/instance-control-webhooks/*) \
$(wildcard all-apps/instance-control/*) \
$(wildcard all-apps/nextcloud/*) \
$(wildcard all-apps/wg-easy/*) \
$(wildcard all-apps/ghost/*) \
@@ -25,7 +26,6 @@ $(wildcard all-apps/dozzle/*)
cp all-apps/restic-snapshot.service app/
cp all-apps/docker-compose.yaml app/
cp all-apps/.env app/
cp -a all-apps/instance-control-webhooks app/ # TODO remove once this is added to DNS/LB/app-config
./copy-apps.sh $(apps_config) && touch $@
# compose .env files
@@ -38,8 +38,11 @@ all-apps/lb/Caddyfile: $(apps_config) make-caddyfile.sh
mkdir -p all-apps/lb
./make-caddyfile.sh $(apps_config) > all-apps/lb/Caddyfile
all-apps/instance-control-webhooks/webhook_secret: $(apps_config)
# Instance Control
all-apps/instance-control/webhook_secret: $(apps_config)
bash -c 'source $(apps_config); printf "%s\n" "$$INSTANCE_CONTROL_WEBHOOKS_SECRET" > $@'
all-apps/instance-control/hooks/hooks.json: $(apps_config) make-instance-control-config.sh
./make-instance-control-config.sh $(apps_config)
# Nextcloud
all-apps/nextcloud/nextcloud_admin_user: $(apps_config)
@@ -97,7 +100,8 @@ restic-password: $(apps_config) make-restic-password.sh
ignition.json: cl.yaml app/.dirstamp \
all-apps/lb/Caddyfile \
all-apps/instance-control-webhooks/webhook_secret \
all-apps/instance-control/webhook_secret \
all-apps/instance-control/hooks/hooks.json \
all-apps/nextcloud/nextcloud_admin_user \
all-apps/nextcloud/nextcloud_admin_password \
all-apps/nextcloud/postgres_db \
@@ -159,7 +163,8 @@ restic-snapshots: $(apps_config) restic-password
archive:
tar -cf nassella-latest.tar all-apps cl.yaml init-restic.sh main.tf make-caddyfile.sh Makefile \
make-generated.sh make-nextcloud-env.sh make-ghost-env.sh make-restic-generated.sh make-restic-password.sh restic-snapshots.sh copy-apps.sh restic-restore.sh restic-snapshot.sh \
make-nassella-authelia-config.sh make-nassella-lldap-config.sh .terraform.lock.hcl
make-nassella-authelia-config.sh make-nassella-lldap-config.sh .terraform.lock.hcl \
make-instance-control-config.sh
cp nassella-latest.tar src/
## to help me remember the command to run to test the config locally