From afa5d79fc26844fc4e663f6f3bbe5bc37c516d7c Mon Sep 17 00:00:00 2001
From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com>
Date: Tue, 5 Sep 2023 20:10:44 +0200
Subject: [PATCH] fixes

---
 apps/openolat/extra-properties.properties |  1 +
 playbooks/vps1.yml                        | 10 ++++++++++
 vps1/docker-compose.yml                   |  9 +++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 apps/openolat/extra-properties.properties

diff --git a/apps/openolat/extra-properties.properties b/apps/openolat/extra-properties.properties
new file mode 100644
index 0000000..17343fa
--- /dev/null
+++ b/apps/openolat/extra-properties.properties
@@ -0,0 +1 @@
+enforce.utf8.filesystem=false
diff --git a/playbooks/vps1.yml b/playbooks/vps1.yml
index e7af41b..0b8fcbc 100644
--- a/playbooks/vps1.yml
+++ b/playbooks/vps1.yml
@@ -11,6 +11,16 @@
         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!
     #####
diff --git a/vps1/docker-compose.yml b/vps1/docker-compose.yml
index b313a1a..6f773c9 100644
--- a/vps1/docker-compose.yml
+++ b/vps1/docker-compose.yml
@@ -26,12 +26,17 @@ services:
       - openolat-network
   openolat:
     container_name: openolat
-    image: "docker.nilstrieb.dev/openolat:aaaaaaaa"
+    image: "docker.nilstrieb.dev/openolat:d8b5cd90"
+    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://openolatdb:5432/oodb"
+      DB_URL: "jdbc:postgresql://openolat-db:5432/oodb"
+      EXTRA_PROPERTIES: "/home/openolat/extra-properties.properties"
     networks:
       - openolat-network