diff --color -ruN base/sandbox/docker-compose.yml hybrid/sandbox/docker-compose.yml --- base/sandbox/docker-compose.yml 2025-05-16 14:24:23.205442568 +0200 +++ hybrid/sandbox/docker-compose.yml 2025-05-16 18:50:42.770649909 +0200 @@ -7,25 +7,12 @@ - internal environment: DOMAIN: "https://bitwarden.vm.local" - DATABASE_URL: "postgres://vaultwarden:vaultwarden@vaultwarden-db/vaultwarden" + DATABASE_URL: "postgres://vaultwarden:vaultwarden@localhost/vaultwarden" volumes: - ./vw-data/:/data/ expose: - 80 - vaultwarden-db: - image: docker.io/library/postgres:latest - container_name: vaultwarden-db - restart: unless-stopped - environment: - POSTGRES_DB: vaultwarden - POSTGRES_USER: vaultwarden - POSTGRES_PASSWORD: vaultwarden - volumes: - - ./vw-postgres:/var/lib/postgresql/data - networks: - - internal - gitea: image: docker.gitea.com/gitea:latest container_name: gitea @@ -33,7 +20,7 @@ - USER_UID=1000 - USER_GID=1000 - GITEA__database__DB_TYPE=postgres - - GITEA__database__HOST=gitea-db:5432 + - GITEA__database__HOST=localhost:5432 - GITEA__database__NAME=gitea - GITEA__database__USER=gitea - GITEA__database__PASSWD=gitea @@ -49,19 +36,6 @@ - 3000 - 22 - gitea-db: - image: docker.io/library/postgres:latest - container_name: gitea-db - restart: unless-stopped - environment: - - POSTGRES_USER=gitea - - POSTGRES_PASSWORD=gitea - - POSTGRES_DB=gitea - volumes: - - ./postgres:/var/lib/postgresql/data - networks: - - internal - vulnerable: build: /vagrant/sandbox/vuln ports: diff --color -ruN base/sandbox/playbook.yml hybrid/sandbox/playbook.yml --- base/sandbox/playbook.yml 2025-05-16 14:24:38.114525247 +0200 +++ hybrid/sandbox/playbook.yml 2025-05-16 18:54:14.467644981 +0200 @@ -15,6 +15,7 @@ - curl - software-properties-common - virtualenv + - postgresql state: latest update_cache: true @@ -148,6 +149,40 @@ name: ssh state: restarted + - name: Ensure PostgreSQL service is running + service: + name: postgresql + state: started + enabled: yes + + - name: Create PostgreSQL user for gitea + become_user: postgres + postgresql_user: + name: gitea + password: gitea + state: present + + - name: Create PostgreSQL database for gitea + become_user: postgres + postgresql_db: + name: gitea + owner: gitea + state: present + + - name: Create PostgreSQL user for vaultwarden + become_user: postgres + postgresql_user: + name: vaultwarden + password: vaultwarden + state: present + + - name: Create PostgreSQL database for vaultwarden + become_user: postgres + postgresql_db: + name: vaultwarden + owner: vaultwarden + state: present + - name: Ensure Docker service is running service: name: docker