git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #74763 from nek0/restya-board-config-fix

restya-board: Restya board config fix

commit133a5c345c31a6449202fedd37a73fde6a6a4fda authorAaron Andersen <aaron@fosslib.net> dateMon 23 Dec 2019, 07:42 (7 years ago) parentcebf1ccacd1240
1 file changed+2−2
nixos/modules/services/web-apps/restya-board.nix+2−2
nixos/modules/services/web-apps/restya-board.nix+2−2
@@ -116,7 +116,7 @@ in
116116 };
117117
118118 passwordFile = mkOption {
119− type = types.nullOr types.str;
119+ type = types.nullOr types.path;
120120 default = null;
121121 description = ''
122122 The database user's password. 'null' if no password is set.
@@ -285,7 +285,7 @@ in
285285 sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', 'restya');/g" "${runDir}/server/php/config.inc.php"
286286 '' else ''
287287 sed -i "s/^.*'R_DB_HOST'.*$/define('R_DB_HOST', '${cfg.database.host}');/g" "${runDir}/server/php/config.inc.php"
288− sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', '$(<${cfg.database.dbPassFile})');/g" "${runDir}/server/php/config.inc.php"
288+ sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', ${if cfg.database.passwordFile == null then "''" else "'file_get_contents(${cfg.database.passwordFile})'"});/g" "${runDir}/server/php/config.inc.php
289289 ''}
290290 sed -i "s/^.*'R_DB_PORT'.*$/define('R_DB_PORT', '${toString cfg.database.port}');/g" "${runDir}/server/php/config.inc.php"
291291 sed -i "s/^.*'R_DB_NAME'.*$/define('R_DB_NAME', '${cfg.database.name}');/g" "${runDir}/server/php/config.inc.php"