diff --git a/README.md b/README.md index a28814a..1aa7652 100644 --- a/README.md +++ b/README.md @@ -21,5 +21,6 @@ to avoid checking for a new version every single run. ## TODO - [x] Migrate to `community.docker.docker_compose_v2` (`v1` is deprecated) -- [ ] Nix Gitea Action runner with host Nix daemon -- [ ] Install but disable zomboid server +- [x] Nix Gitea Action runner +- [x] Install but disable zomboid server +- [ ] Download volume for yore diff --git a/ansible/playbooks/nanna-docker.yaml b/ansible/playbooks/nanna-docker.yaml index a0e6708..1637889 100644 --- a/ansible/playbooks/nanna-docker.yaml +++ b/ansible/playbooks/nanna-docker.yaml @@ -60,6 +60,8 @@ state: present - name: zomboid state: present + - name: yore + state: present # This needs to be done for any services where user: # is set in docker-compose.yaml. - name: Create volume directories with correct permissions @@ -123,5 +125,7 @@ state: present - name: vrnp state: present + - name: yore + state: present - name: zomboid state: absent diff --git a/docker/docker/caddy/Caddyfile b/docker/docker/caddy/Caddyfile index ff64184..ed4f417 100644 --- a/docker/docker/caddy/Caddyfile +++ b/docker/docker/caddy/Caddyfile @@ -42,17 +42,6 @@ git.pbrinkmeier.de { reverse_proxy gitea:3000 } -ci.pbrinkmeier.de { - reverse_proxy drone:80 -} - -jupyter.pbrinkmeier.de { - reverse_proxy jupyter:8888 - basicauth { - wug JDJhJDE0JEJrQXUzVWxFZ2JGVmx6YlZWTkpYdy5IMjRXdnZZdGw5SjZDcUg2ZWMxOEVjcEV6dWhIRmhD - } -} - plantuml.pbrinkmeier.de { reverse_proxy codi_plantuml:8080 } @@ -64,3 +53,7 @@ utoy.beany.club { vrnp.beany.club { reverse_proxy vrnp:8000 } + +fz.beany.club { + reverse_proxy yore:3000 +} diff --git a/docker/docker/yore/docker-compose.yaml b/docker/docker/yore/docker-compose.yaml new file mode 100644 index 0000000..4509e08 --- /dev/null +++ b/docker/docker/yore/docker-compose.yaml @@ -0,0 +1,23 @@ +services: + yore: + image: git.pbrinkmeier.de/paul/yore:0.0.5 + restart: always + environment: + # For dbmate (migrations) + DATABASE_URL: "postgres://yore:${YORE_DB_PASSWORD}@yore_db/yore-db?sslmode=disable&search_path=public" + # For yore itself + YORE_DB: "host=yore_db dbname=yore-db user=yore password=${YORE_DB_PASSWORD}" + + yore_db: + image: postgres:17-alpine + restart: unless-stopped + environment: + POSTGRES_DB: yore-db + POSTGRES_USER: yore + POSTGRES_PASSWORD: "${YORE_DB_PASSWORD}" + + +networks: + default: + name: caddy-network + external: true diff --git a/docker/envs/yore/.env b/docker/envs/yore/.env new file mode 100644 index 0000000..6566d43 --- /dev/null +++ b/docker/envs/yore/.env @@ -0,0 +1,7 @@ +$ANSIBLE_VAULT;1.1;AES256 +36313063633538313631386664353535373166306563613830316430613035306438326564396331 +6336306566306166616266643630343262616465306631350a393932613665346164613361333037 +39386135396364666630623962653462623234386430383034353731353361663837343036393130 +3261633964626135610a626364363761373734333762373764366363643537316662643634616263 +32383730663230303064626130393164616237636362656331313333316439323135366535303334 +3436323333383739666261656531363335326532616562353166