summary refs log tree commit diff
diff options
context:
space:
mode:
authornek0 <nek0@nek0.eu>2019-12-25 07:23:27 +0100
committernek0 <nek0@nek0.eu>2019-12-25 07:23:27 +0100
commit80a72807e7d32d5176b1734accb867cd43da95c4 (patch)
treeb3d41ed89d435f8f92a139767c438678d8fe6432
parente1c47b01030714b4aa0992d715475c108417f807 (diff)
downloadnixpkgs-80a72807e7d32d5176b1734accb867cd43da95c4.tar
nixpkgs-80a72807e7d32d5176b1734accb867cd43da95c4.tar.gz
nixpkgs-80a72807e7d32d5176b1734accb867cd43da95c4.tar.bz2
nixpkgs-80a72807e7d32d5176b1734accb867cd43da95c4.tar.lz
nixpkgs-80a72807e7d32d5176b1734accb867cd43da95c4.tar.xz
nixpkgs-80a72807e7d32d5176b1734accb867cd43da95c4.tar.zst
nixpkgs-80a72807e7d32d5176b1734accb867cd43da95c4.zip
restya-board: change password read-in to cat
-rw-r--r--nixos/modules/services/web-apps/restya-board.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix
index 16ad5cdfcd6..249fd29ec5f 100644
--- a/nixos/modules/services/web-apps/restya-board.nix
+++ b/nixos/modules/services/web-apps/restya-board.nix
@@ -285,7 +285,7 @@ in
           sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', 'restya');/g" "${runDir}/server/php/config.inc.php"
         '' else ''
           sed -i "s/^.*'R_DB_HOST'.*$/define('R_DB_HOST', '${cfg.database.host}');/g" "${runDir}/server/php/config.inc.php"
-          sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', ${if cfg.database.passwordFile == null then "''" else "'${builtins.replaceStrings ["\n"] [""] (builtins.readFile cfg.database.passwordFile)}');/g"}" "${runDir}/server/php/config.inc.php"
+          sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', ${if cfg.database.passwordFile == null then "''" else "'$(cat ${cfg.database.passwordFile})');/g"}" "${runDir}/server/php/config.inc.php"
         ''}
         sed -i "s/^.*'R_DB_PORT'.*$/define('R_DB_PORT', '${toString cfg.database.port}');/g" "${runDir}/server/php/config.inc.php"
         sed -i "s/^.*'R_DB_NAME'.*$/define('R_DB_NAME', '${cfg.database.name}');/g" "${runDir}/server/php/config.inc.php"