From 2a0019457d3c00dc32899ab9486d555a1b5db958 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 31 May 2024 17:16:52 +0200
Subject: [PATCH] matrix-synapse: create with utf-8 encoding

---
 clanModules/matrix-synapse/default.nix | 32 +++++++-------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/clanModules/matrix-synapse/default.nix b/clanModules/matrix-synapse/default.nix
index e0eb7dbe..09429a38 100644
--- a/clanModules/matrix-synapse/default.nix
+++ b/clanModules/matrix-synapse/default.nix
@@ -81,30 +81,14 @@ in
       };
     };
 
-    systemd.services.matrix-synapse.serviceConfig.ExecStartPre = [
-      "+${pkgs.writeShellScript "create-matrix-synapse-db" ''
-        export PATH=${
-          lib.makeBinPath [
-            config.services.postgresql.package
-            pkgs.util-linux
-            pkgs.gnugrep
-          ]
-        }
-        psql() { runuser -u postgres -- psql "$@"; }
-        # wait for postgres to be ready
-        while ! runuser -u postgres pg_isready; do
-          sleep 1
-        done
-        if ! psql -tAc "SELECT 1 FROM pg_database WHERE datname = 'matrix-synapse'" | grep -q 1; then
-          psql -c "CREATE DATABASE \"matrix-synapse\" TEMPLATE template0 LC_COLLATE = 'C' LC_CTYPE = 'C'"
-        fi
-        # create user if it doesn't exist and make it owner of the database
-        if ! psql -tAc "SELECT 1 FROM pg_user WHERE usename = 'matrix-synapse'" | grep -q 1; then
-          psql -c "CREATE USER \"matrix-synapse\""
-          psql -c "ALTER DATABASE \"matrix-synapse\" OWNER TO \"matrix-synapse\""
-        fi
-      ''}"
-    ];
+    clan.postgresql.users.matrix-synapse = { };
+    clan.postgresql.databases.matrix-synapse.create.options = {
+      TEMPLATE = "template0";
+      LC_COLLATE = "C";
+      LC_CTYPE = "C";
+      ENCODING = "UTF8";
+      OWNER = "matrix-synapse";
+    };
 
     clanCore.facts.services."matrix-synapse" = {
       secret."synapse-registration_shared_secret" = { };