From 1926fb1b9b110762934fd3903ccc8e92e1beca67 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Tue, 27 Jan 2026 11:36:25 +0100
Subject: [PATCH] nixos/tests/postgresql: replace activation scripts by systemd
 services

See https://github.com/NixOS/nixpkgs/issues/475305
---
 .../postgresql/postgresql-tls-client-cert.nix | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/postgresql/postgresql-tls-client-cert.nix b/nixos/tests/postgresql/postgresql-tls-client-cert.nix
index 6cb86d1ff8fc..acb531780f76 100644
--- a/nixos/tests/postgresql/postgresql-tls-client-cert.nix
+++ b/nixos/tests/postgresql/postgresql-tls-client-cert.nix
@@ -40,8 +40,15 @@ let
       nodes.server =
         { ... }:
         {
-          system.activationScripts = {
-            keyPlacement.text = ''
+          systemd.services.create-keys = {
+            wantedBy = [ "postgresql.target" ];
+
+            serviceConfig = {
+              Type = "oneshot";
+              RemainAfterExit = true;
+            };
+
+            script = ''
               mkdir -p '${serverKeyPath}'
               cp '${serverKey}' '${serverKeyPath}/server.key'
               chown postgres:postgres '${serverKeyPath}/server.key'
@@ -85,8 +92,15 @@ let
       nodes.client =
         { ... }:
         {
-          system.activationScripts = {
-            keyPlacement.text = ''
+          systemd.services.create-keys = {
+            wantedBy = [ "multi-user.target" ];
+
+            serviceConfig = {
+              Type = "oneshot";
+              RemainAfterExit = true;
+            };
+
+            script = ''
               mkdir -p '${clientKeyPath}'
               cp '${clientKey}' '${clientKeyPath}/client.key'
               chown root:root '${clientKeyPath}/client.key'