move openolat

.gitignore

@@ -1 +1,2 @@
 /.vscode
+/temp

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.

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.

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
-}

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:

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
+}

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:
+  openolat-network: