about summary refs log tree commit diff
path: root/nixos/modules/services/admin
diff options
context:
space:
mode:
authorFlorian Brandes <florian.brandes@posteo.de>2024-01-11 10:34:37 +0100
committerFlorian Brandes <florian.brandes@posteo.de>2024-01-11 11:32:32 +0100
commitbc21d288f4f089af32f5ee306352f5e11c93da64 (patch)
tree6505686d2237775ee944022b87d4db9aa047a813 /nixos/modules/services/admin
parent010a6250db54a2efb74d7db846379eae0878de09 (diff)
downloadnixlib-bc21d288f4f089af32f5ee306352f5e11c93da64.tar
nixlib-bc21d288f4f089af32f5ee306352f5e11c93da64.tar.gz
nixlib-bc21d288f4f089af32f5ee306352f5e11c93da64.tar.bz2
nixlib-bc21d288f4f089af32f5ee306352f5e11c93da64.tar.lz
nixlib-bc21d288f4f089af32f5ee306352f5e11c93da64.tar.xz
nixlib-bc21d288f4f089af32f5ee306352f5e11c93da64.tar.zst
nixlib-bc21d288f4f089af32f5ee306352f5e11c93da64.zip
nixos/pgadmin: apply review suggestions
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
Diffstat (limited to 'nixos/modules/services/admin')
-rw-r--r--nixos/modules/services/admin/pgadmin.nix11
1 files changed, 5 insertions, 6 deletions
diff --git a/nixos/modules/services/admin/pgadmin.nix b/nixos/modules/services/admin/pgadmin.nix
index fb7b65171aad..09a9b2714e34 100644
--- a/nixos/modules/services/admin/pgadmin.nix
+++ b/nixos/modules/services/admin/pgadmin.nix
@@ -44,13 +44,13 @@ in
     initialPasswordFile = mkOption {
       description = lib.mdDoc ''
         Initial password file for the pgAdmin account. Minimum length by default is 6.
-        Please see services.pgadmin.passwordLength.
+        Please see `services.pgadmin.minimumPasswordLength`.
         NOTE: Should be string not a store path, to prevent the password from being world readable
       '';
       type = types.path;
     };
 
-    passwordLength = mkOption {
+    minimumPasswordLength = mkOption {
       description = lib.mdDoc "Minimum length of the password";
       type = types.int;
       default = 6;
@@ -122,7 +122,7 @@ in
 
     services.pgadmin.settings = {
       DEFAULT_SERVER_PORT = cfg.port;
-      PASSWORD_LENGTH_MIN = cfg.passwordLength;
+      PASSWORD_LENGTH_MIN = cfg.minimumPasswordLength;
       SERVER_MODE = true;
     } // (optionalAttrs cfg.openFirewall {
       DEFAULT_SERVER = mkDefault "::";
@@ -151,9 +151,8 @@ in
         # and presenting a hard to find error message
         # see https://github.com/NixOS/nixpkgs/issues/270624
         PW_LENGTH=$(wc -m < ${escapeShellArg cfg.initialPasswordFile})
-        if [ $PW_LENGTH -lt ${toString cfg.passwordLength} ]
-          then
-            echo "Password must be at least ${toString cfg.passwordLength} characters long"
+        if [ $PW_LENGTH -lt ${toString cfg.minimumPasswordLength} ]; then
+            echo "Password must be at least ${toString cfg.minimumPasswordLength} characters long"
             exit 1
         fi
         (