diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 15c53ec..ac6eb67 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -14,6 +14,7 @@ on: - hugo-chat - cors - uptime + - dockerolat jobs: build: diff --git a/playbooks/vps1.yml b/playbooks/vps1.yml index f6b59d3..e7af41b 100644 --- a/playbooks/vps1.yml +++ b/playbooks/vps1.yml @@ -4,9 +4,22 @@ gather_facts: false tasks: ##### + # APP: openolat, /apps/openolat + ##### + - name: Create /apps/openolat + ansible.builtin.file: + path: /apps/openolat + state: directory + mode: "u=rwx,g=rx,o=rx" + ##### # END: docker compose up! ##### # We want this to be last so that all app-specific config has been done. + - name: Copy .env + ansible.builtin.copy: + dest: "/apps/.env" + src: "../secrets/vps1.env" + mode: "u=r,g=r,o=r" - name: Docker compose up! 🚀 community.docker.docker_compose: project_src: /apps diff --git a/secrets/vps1.env b/secrets/vps1.env new file mode 100644 index 0000000..1b3cfc9 Binary files /dev/null and b/secrets/vps1.env differ diff --git a/vps1/Caddyfile b/vps1/Caddyfile index d4a4077..932888d 100644 --- a/vps1/Caddyfile +++ b/vps1/Caddyfile @@ -36,3 +36,7 @@ vps1.nilstrieb.dev { uptime.nilstrieb.dev { reverse_proxy * localhost:5010 } + +olat.nilstrieb.dev { + reverse_proxy * localhost:5011 +} diff --git a/vps1/README.md b/vps1/README.md index fccf2ff..da91464 100644 --- a/vps1/README.md +++ b/vps1/README.md @@ -1,3 +1,4 @@ ## ports -- `5010`: uptime \ No newline at end of file +- `5010`: uptime +- `5011`: openolat diff --git a/vps1/docker-compose.yml b/vps1/docker-compose.yml index a9ace48..b313a1a 100644 --- a/vps1/docker-compose.yml +++ b/vps1/docker-compose.yml @@ -10,5 +10,30 @@ services: UPTIME_CONFIG_PATH: /app/config/uptime.json ports: - "5010:3000" + ##### openolat + openolat_db: + container_name: openolat-db + image: "postgres:latest" + restart: always + volumes: + - "/apps/openolat/data:/var/lib/postgresql/data" + environment: + POSTGRES_DB: oodb + POSTGRES_USER: oodbu + POSTGRES_PASSWORD: "${OPENOLAT_DB_PASSWORD}" + PGDATA: "/var/lib/postgresql/data/pgdata" + networks: + - openolat-network + openolat: + container_name: openolat + image: "docker.nilstrieb.dev/openolat:aaaaaaaa" + ports: + - "5011:8088" + environment: + DB_PASSWORD: "${OPENOLAT_DB_PASSWORD}" + DB_URL: "jdbc:postgresql://openolatdb:5432/oodb" + networks: + - openolat-network -networks: {} +networks: + openolat-network: \ No newline at end of file