force

DSAV-Dodeka · Nov 13, 2023 · 0bdcabe · 0bdcabe
1 parent cc6b02c
commit 0bdcabe
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 377 deletions.
diff --git a/build_deploy.sh b/build_deploy.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 poetry run confrecipe -r build/deploy/dev/dev.toml -e localdev
-poetry run confrecipe -r build/deploy/staging/staging.toml -e staging
-poetry run confrecipe -r build/deploy/production/production.toml -e production
-poetry run confrecipe -r build/data_sync/data_sync.toml -e production
+#poetry run confrecipe -r build/deploy/staging/staging.toml -e staging
+#poetry run confrecipe -r build/deploy/production/production.toml -e production
+#poetry run confrecipe -r build/data_sync/data_sync.toml -e production
diff --git a/config_z.toml b/config_z.toml
@@ -1,25 +1,12 @@
 [main]
 docker_net_name = "dodeka"
-
-[backup]
-project = "b-dodeka"
-service_name = "backup"
-# must match <project>-<service_name>-1
-container_name = "b-dodeka-backup-1"
-# metaconfig
-image_name = "ghcr.io/dsav-dodeka/barman"
-resources_target = "/dodeka_barman"
-volume_name = "b-dodeka-backup-volume"
-recover_volume = "b-dodeka-backup-volume-recover"
-recover_target = "/dodeka_recover"
-
+project = "dodeka"
 
 [db]
-project = "d-dodeka"
 service_name = "db"
 # must match <project>-<service_name>-1
-container_name = "d-dodeka-db-1"
-barman_server_name = "d-dodeka-db-1"
+container_name = "dodeka-db-1"
+barman_server_name = "dodeka-db-1"
 postgres_conf_dir = "/dodeka_conf"
 init_dir = "/dodeka_init"
 # metaconfig
@@ -28,7 +15,7 @@ host_host = "127.0.0.1"
 host_port = "3141"
 container_port = "3141"
 resources_target = "/dodeka-db"
-volume_name = "d-dodeka-db-volume"
+volume_name = "dodeka-db-volume"
 db_name = "dodeka"
 db_user = "dodeka"
 # using default
@@ -37,22 +24,19 @@ image_desc = "Image for D.S.A.V. Dodeka PostgreSQL instance."
 
 [kv]
 redisjson_version = "v2.6.6"
-project = "ts-dodeka"
 service_name = "kv"
-container_name = "ts-dodeka-kv-1"
+container_name = "dodeka-kv-1"
 image_name = "ghcr.io/dsav-dodeka/redis"
 host_host = "127.0.0.1"
 host_port = "6379"
 container_port = "6379"
 
 [server]
-project = "s-dodeka"
 service_name = "server"
 # must match <project>-<service_name>-1
-container_name = "s-dodeka-server-1"
+container_name = "dodeka-server-1"
 # metaconfig
 image_name = "ghcr.io/dsav-dodeka/server"
-deps_image_name = "ghcr.io/dsav-dodeka/server-deps"
 host_host = "127.0.0.1"
 host_port = "4241"
 container_port = "4241"
@@ -62,6 +46,7 @@ backend_client_id = "dodekabackend_client"
 signup_url = "https://www.av40.nl/index.php?page=Inschrijfformulier&sid=1"
 onboard_email = "[email protected]"
 smtp_port = 587
+realm = "dodeka"
 
 [confspawn_env.production]
 name = "production"
@@ -98,7 +83,6 @@ mail_enabled = false
 name = "localdev"
 version = "localdev"
 db_password = "postpost"
-barman_password = "barbar"
 redis_password = "redisredis"
 allowed_envs = "\"envless\", \"localdev\", \"test\""
 api_root = "http://localhost:4243"

diff --git a/use/data_sync/cli.py b/use/data_sync/cli.py
diff --git a/use/data_sync/connect.json b/use/data_sync/connect.json
diff --git a/use/data_sync/migrate.py b/use/data_sync/migrate.py
diff --git a/use/data_sync/migrate_env.sh b/use/data_sync/migrate_env.sh
diff --git a/use/data_sync/sync.toml b/use/data_sync/sync.toml
diff --git a/use/dev/dev.env b/use/dev/dev.env
@@ -8,7 +8,7 @@ KV_HOST_HOST=127.0.0.1
 DB_HOST_HOST=127.0.0.1
 SERVER_HOST_HOST=127.0.0.1
 
-REDIS_PASSWORD=redisredis
+REDIS_PASSWORD=
 # The tag to upload to GHCR to
 KV_IMAGE=ghcr.io/dsav-dodeka/redis
 # Docker tag version

diff --git a/use/production/docker-compose.yml b/use/production/docker-compose.yml
diff --git a/use/production/production.env b/use/production/production.env
diff --git a/use/repl/docker-compose.yml b/use/repl/docker-compose.yml
diff --git a/use/repl/repl.env b/use/repl/repl.env