about summary refs log tree commit diff
path: root/nixos/modules/services/mail
diff options
context:
space:
mode:
authorEmily Trau <13267947+emilytrau@users.noreply.github.com>2023-12-01 15:50:05 +1100
committerGitHub <noreply@github.com>2023-12-01 15:50:05 +1100
commit7edd128431ad6d22d21c7976def9f4df0a955fd5 (patch)
tree07d3c406bb87bde8ab6b1fba1de94eb4fdf016a9 /nixos/modules/services/mail
parentc0303081dbec199a9823b12dedb60c6d759bc2d6 (diff)
parentae5fe741ba9acade281a9185139e3922811c9696 (diff)
downloadnixlib-7edd128431ad6d22d21c7976def9f4df0a955fd5.tar
nixlib-7edd128431ad6d22d21c7976def9f4df0a955fd5.tar.gz
nixlib-7edd128431ad6d22d21c7976def9f4df0a955fd5.tar.bz2
nixlib-7edd128431ad6d22d21c7976def9f4df0a955fd5.tar.lz
nixlib-7edd128431ad6d22d21c7976def9f4df0a955fd5.tar.xz
nixlib-7edd128431ad6d22d21c7976def9f4df0a955fd5.tar.zst
nixlib-7edd128431ad6d22d21c7976def9f4df0a955fd5.zip
Merge pull request #266746 from serpent213/patch-2
nixos/roundcube: Ignore newline at end of password file
Diffstat (limited to 'nixos/modules/services/mail')
-rw-r--r--nixos/modules/services/mail/roundcube.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix
index d9595b8e34ee..c35ece8362f6 100644
--- a/nixos/modules/services/mail/roundcube.nix
+++ b/nixos/modules/services/mail/roundcube.nix
@@ -120,7 +120,7 @@ in
       ${lib.optionalString (!localDB) ''
         $password = file('${cfg.database.passwordFile}')[0];
         $password = preg_split('~\\\\.(*SKIP)(*FAIL)|\:~s', $password);
-        $password = end($password);
+        $password = rtrim(end($password));
         $password = str_replace("\\:", ":", $password);
         $password = str_replace("\\\\", "\\", $password);
       ''}