From 19234d6b04e931ab4b7f77063e1865d2a2ac9549 Mon Sep 17 00:00:00 2001 From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> Date: Sat, 3 Feb 2024 17:24:06 +0100 Subject: [PATCH] move openolat --- .gitignore | 3 ++- playbooks/vps1.yml | 18 ------------------ playbooks/vps2.yml | 18 ++++++++++++++++++ secrets/vps1.env | Bin 82 -> 22 bytes secrets/vps2.env | Bin 173 -> 234 bytes vps1/Caddyfile | 8 -------- vps1/docker-compose.yml | 33 --------------------------------- vps2/Caddyfile | 8 ++++++++ vps2/docker-compose.yml | 33 ++++++++++++++++++++++++++++++++- 9 files changed, 60 insertions(+), 61 deletions(-) diff --git a/.gitignore b/.gitignore index 0dc7b4b..e7609f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/.vscode \ No newline at end of file +/.vscode +/temp diff --git a/playbooks/vps1.yml b/playbooks/vps1.yml index 9469559..0f4820e 100644 --- a/playbooks/vps1.yml +++ b/playbooks/vps1.yml @@ -17,24 +17,6 @@ src: ../apps/uptime/uptime.json mode: "u=r,g=r,o=r" ##### - # APP: openolat, /apps/openolat - ##### - - name: Create /apps/openolat - ansible.builtin.file: - path: /apps/openolat - state: directory - mode: "u=rwx,g=rx,o=rx" - - name: Copy extra properties - ansible.builtin.copy: - dest: /apps/openolat/extra-properties.properties - src: ../apps/openolat/extra-properties.properties - mode: "u=r,g=r,o=r" - - name: Olat data file permissions # TODO: a bit hacky. - ansible.builtin.file: - path: /apps/openolat/olatdata - state: directory - mode: "u=rwx,g=rwx,o=rwx" - ##### # END: docker compose up! ##### # We want this to be last so that all app-specific config has been done. diff --git a/playbooks/vps2.yml b/playbooks/vps2.yml index 02bfbe3..2a0476d 100644 --- a/playbooks/vps2.yml +++ b/playbooks/vps2.yml @@ -118,6 +118,24 @@ src: "../secrets/minecraft/.env" mode: "u=r,g=r,o=r" ##### + # APP: openolat, /apps/openolat + ##### + - name: Create /apps/openolat + ansible.builtin.file: + path: /apps/openolat + state: directory + mode: "u=rwx,g=rx,o=rx" + - name: Copy extra properties + ansible.builtin.copy: + dest: /apps/openolat/extra-properties.properties + src: ../apps/openolat/extra-properties.properties + mode: "u=r,g=r,o=r" + - name: Olat data file permissions # TODO: a bit hacky. + ansible.builtin.file: + path: /apps/openolat/olatdata + state: directory + mode: "u=rwx,g=rwx,o=rwx" + ##### # END: docker compose up! ##### # We want this to be last so that all app-specific config has been done. diff --git a/secrets/vps1.env b/secrets/vps1.env index 1b3cfc91a57ef95306ad7c464e7690a1caf22190..bdcfc28dfe75eb0d0c67863793a766a696ef10be 100644 GIT binary patch literal 22 ecmZQ@_Y83kiVO&0cy^(~`S+uilf74u#{&Ri=L)I- literal 82 zcmZQ@_Y83kiVO&0Nd9!=l;w)$pZ^~AI%OT-zl_N{A&~d3!E2L-6T3cru+pBcs{Q|p q@q(EB`!}kVtN!s2`Wtj@{gQi=wk~_~_tx}APW|gHsUb=KJ^=u6!78@^ diff --git a/secrets/vps2.env b/secrets/vps2.env index 18511bdc918ffa094860a0c03bcd4529e5d2c500..b26a26550171f2e5fd5def7e30afb89b1c90d1af 100644 GIT binary patch literal 234 zcmZQ@_Y83kiVO&0U~EloShDVi-2MIK@&4tR=G<5J_$BP--E1o_SMu)m?7}bF=l_Om zd~2s!xO3&{g(CX>Hw;#Ygf3sPeMz3Pn$XdpY3pB|s1utzze6#s{-RuF%xT%C1xKBt zAI@H`_fGEpwpGFUhbmY6_mOCx^7K_zopwT+SeC4o%?!`Of&#IRBE&bkZ495w!t{wL zP$PwLtInNtu5y(veg1r#p6l*(Gi06?6JEjjFXUw9pYtyBEqHEU3jg98@N!MOPUPPe tl9h{g|5!9#=ekn8`M$Yf|F-mbv>#vS)4qW#@~-d7AC{r3YMWj!0|2C*Iys@u(W2|3fxrp#Me?7upSp#f7O`<%eO1V@Pi5(= zytn&eq+GdcqFXmxyxsmiNw~4YVdYwrHfFWpS?8LzzgqJ3`1x)n-ow7EC!YJps=KVP ztA4ywVzL%Pg5bWz4`!MgE_{FL@Ln#xixJ=NxL?`0;^-R@SwUsV48aK@_a-&1-!7>9 g^IntBr75%dq!_>bbM{wLustC5Z^~(Z>9DWw0FpmXga7~l diff --git a/vps1/Caddyfile b/vps1/Caddyfile index 1f7eead..d4a4077 100644 --- a/vps1/Caddyfile +++ b/vps1/Caddyfile @@ -36,11 +36,3 @@ vps1.nilstrieb.dev { uptime.nilstrieb.dev { reverse_proxy * localhost:5010 } - -olat.nilstrieb.dev { - reverse_proxy * localhost:5011 -} - -olat.nilstrieb.dev:8088 { - reverse_proxy * localhost:5011 -} diff --git a/vps1/docker-compose.yml b/vps1/docker-compose.yml index 3001963..0ca908f 100644 --- a/vps1/docker-compose.yml +++ b/vps1/docker-compose.yml @@ -10,36 +10,3 @@ 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:50feab31" - restart: always - volumes: - - "/apps/openolat/olatdata:/home/openolat/olatdata" - - "/apps/openolat/extra-properties.properties:/home/openolat/extra-properties.properties" - ports: - - "5011:8088" - environment: - DB_PASSWORD: "${OPENOLAT_DB_PASSWORD}" - DB_URL: "jdbc:postgresql://openolat-db:5432/oodb" - EXTRA_PROPERTIES: "/home/openolat/extra-properties.properties" - OLAT_HOST: olat.nilstrieb.dev - networks: - - openolat-network - -networks: - openolat-network: \ No newline at end of file diff --git a/vps2/Caddyfile b/vps2/Caddyfile index b56482c..5595d2a 100644 --- a/vps2/Caddyfile +++ b/vps2/Caddyfile @@ -66,3 +66,11 @@ cors-school.nilstrieb.dev { bisect-rustc.nilstrieb.dev { reverse_proxy * localhost:5005 } + +olat.nilstrieb.dev { + reverse_proxy * localhost:5011 +} + +olat.nilstrieb.dev:8088 { + reverse_proxy * localhost:5011 +} diff --git a/vps2/docker-compose.yml b/vps2/docker-compose.yml index 6df430c..bd1a450 100644 --- a/vps2/docker-compose.yml +++ b/vps2/docker-compose.yml @@ -169,7 +169,38 @@ services: # - "25565:25565" # volumes: # - /apps/minecraft/server:/data + ##### 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:50feab31" + restart: always + volumes: + - "/apps/openolat/olatdata:/home/openolat/olatdata" + - "/apps/openolat/extra-properties.properties:/home/openolat/extra-properties.properties" + ports: + - "5011:8088" + environment: + DB_PASSWORD: "${OPENOLAT_DB_PASSWORD}" + DB_URL: "jdbc:postgresql://openolat-db:5432/oodb" + EXTRA_PROPERTIES: "/home/openolat/extra-properties.properties" + OLAT_HOST: olat.nilstrieb.dev + networks: + - openolat-network networks: cors-school: hugo-chat: - karin-bot: \ No newline at end of file + karin-bot: + openolat-network: