about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2023-12-04 08:56:45 -0500
committerGitHub <noreply@github.com>2023-12-04 08:56:45 -0500
commitc0443ea94c9a7c05278fa9b134c5a8e61c84a0f0 (patch)
treef761bac61846123079443cdd1d3d315c4b99c1ad /nixos
parent90e4744741ee744d37d005434b82588d6ee57205 (diff)
parent8667baf161e3f705f56c1bdd9cc48f187a3627a6 (diff)
downloadnixlib-c0443ea94c9a7c05278fa9b134c5a8e61c84a0f0.tar
nixlib-c0443ea94c9a7c05278fa9b134c5a8e61c84a0f0.tar.gz
nixlib-c0443ea94c9a7c05278fa9b134c5a8e61c84a0f0.tar.bz2
nixlib-c0443ea94c9a7c05278fa9b134c5a8e61c84a0f0.tar.lz
nixlib-c0443ea94c9a7c05278fa9b134c5a8e61c84a0f0.tar.xz
nixlib-c0443ea94c9a7c05278fa9b134c5a8e61c84a0f0.tar.zst
nixlib-c0443ea94c9a7c05278fa9b134c5a8e61c84a0f0.zip
Merge pull request #271869 from wentasah/redmine-assertions
nixos/redmine: Fix database assertions
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/misc/redmine.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix
index e3941d2e29de..b517170cda21 100644
--- a/nixos/modules/services/misc/redmine.nix
+++ b/nixos/modules/services/misc/redmine.nix
@@ -264,9 +264,12 @@ in
       { assertion = cfg.database.passwordFile != null || cfg.database.socket != null;
         message = "one of services.redmine.database.socket or services.redmine.database.passwordFile must be set";
       }
-      { assertion = cfg.database.createLocally -> cfg.database.user == cfg.user && cfg.database.user == cfg.database.name;
+      { assertion = cfg.database.createLocally -> cfg.database.user == cfg.user;
         message = "services.redmine.database.user must be set to ${cfg.user} if services.redmine.database.createLocally is set true";
       }
+      { assertion = pgsqlLocal -> cfg.database.user == cfg.database.name;
+        message = "services.redmine.database.user and services.redmine.database.name must be the same when using a local postgresql database";
+      }
       { assertion = cfg.database.createLocally -> cfg.database.socket != null;
         message = "services.redmine.database.socket must be set if services.redmine.database.createLocally is set to true";
       }