From 53104f55f97b23b885eb0948b618caeb04d66a1a Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Mon, 22 Dec 2025 16:27:09 +0100
Subject: [PATCH] btcpayserver: update postgresql setup to NixOS 25.11

---
 modules/btcpayserver.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/btcpayserver.nix b/modules/btcpayserver.nix
index a84b5a5..0249bf8 100644
--- a/modules/btcpayserver.nix
+++ b/modules/btcpayserver.nix
@@ -135,14 +135,17 @@ in {
     };
     services.postgresql = {
       enable = true;
-      ensureDatabases = [ "btcpaydb" "nbxplorer" ];
+      ensureDatabases = [
+        "btcpaydb" # This name is kept for backwards compatibility
+        "nbxplorer"
+      ];
       ensureUsers = [
         { name = cfg.btcpayserver.user; }
         { name = cfg.nbxplorer.user; }
       ];
     };
-    systemd.services.postgresql.postStart = lib.mkAfter ''
-      $PSQL -tAc '
+    systemd.services.postgresql-setup.postStart = ''
+      psql -tAc '
         ALTER DATABASE "btcpaydb" OWNER TO "${cfg.btcpayserver.user}";
         ALTER DATABASE "nbxplorer" OWNER TO "${cfg.nbxplorer.user}";
       '
@@ -171,7 +174,7 @@ in {
       '';
     in rec {
       wantedBy = [ "multi-user.target" ];
-      requires = [ "postgresql.service" ];
+      requires = [ "postgresql.target" ];
       wants = [ "bitcoind.service" ] ++ optional cfg.btcpayserver.lbtc "liquidd.service";
       after = requires ++ wants ++ [ "nix-bitcoin-secrets.target" ];
       preStart = ''
@@ -226,7 +229,7 @@ in {
       '');
     in rec {
       wantedBy = [ "multi-user.target" ];
-      requires = [ "postgresql.service" ];
+      requires = [ "postgresql.target" ];
       wants = [ "nbxplorer.service" ]
               ++ optional (cfg.btcpayserver.lightningBackend != null) "${cfg.btcpayserver.lightningBackend}.service";
       after = requires ++ wants;