diff --git a/README.md b/README.md index 1aa7652..0aa080d 100644 --- a/README.md +++ b/README.md @@ -23,4 +23,4 @@ to avoid checking for a new version every single run. - [x] Migrate to `community.docker.docker_compose_v2` (`v1` is deprecated) - [x] Nix Gitea Action runner - [x] Install but disable zomboid server -- [ ] Download volume for yore +- [x] Download volume for yore diff --git a/ansible/group_vars/gods/vars.yaml b/ansible/group_vars/gods/vars.yaml index 89ae453..c89dedb 100644 --- a/ansible/group_vars/gods/vars.yaml +++ b/ansible/group_vars/gods/vars.yaml @@ -13,3 +13,6 @@ gods_users: - name: caddy uid: 42002 state: present + - name: yore + uid: 42004 + state: present diff --git a/ansible/playbooks/nanna-docker.yaml b/ansible/playbooks/nanna-docker.yaml index 1637889..8d0a89b 100644 --- a/ansible/playbooks/nanna-docker.yaml +++ b/ansible/playbooks/nanna-docker.yaml @@ -85,6 +85,8 @@ user: 1000 - name: nix_runner_home_node user: 1000 + - name: yore_data + user: yore # Since some docker-compose configuration might want to pull # images from the Gitea package repository, we need to ensure # that Gitea is reachable before those configurations are deployed. diff --git a/docker/docker/yore/docker-compose.yaml b/docker/docker/yore/docker-compose.yaml index 4509e08..49ff2c0 100644 --- a/docker/docker/yore/docker-compose.yaml +++ b/docker/docker/yore/docker-compose.yaml @@ -1,12 +1,19 @@ services: yore: - image: git.pbrinkmeier.de/paul/yore:0.0.5 + image: git.pbrinkmeier.de/paul/yore:0.0.8 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_DOWNLOAD_DIR: /data/downloads + YORE_DBMATE_DIR: /data/dbmate + user: 42004:42004 + volumes: + - /etc/passwd:/etc/passwd:ro + - /etc/group:/etc/group:ro + - /var/lib/pbri/docker/yore_data:/data yore_db: image: postgres:17-alpine @@ -15,6 +22,8 @@ services: POSTGRES_DB: yore-db POSTGRES_USER: yore POSTGRES_PASSWORD: "${YORE_DB_PASSWORD}" + volumes: + - /var/lib/pbri/docker/yore_db:/var/lib/postgresql/data networks: