diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2019-12-23 07:42:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-23 07:42:37 -0500 |
| commit | 133a5c345c31a6449202fedd37a73fde6a6a4fda (patch) | |
| tree | b72b76362d854cf862f0c11f1f1563e3cfba1431 /nixos | |
| parent | cebf1cc37b5a5dc0dcec57bd4597456fb318039b (diff) | |
| parent | acd1240fd1129391eddbeb8985ff1f9a26c9ee2f (diff) | |
| download | nixpkgs-133a5c345c31a6449202fedd37a73fde6a6a4fda.tar nixpkgs-133a5c345c31a6449202fedd37a73fde6a6a4fda.tar.gz nixpkgs-133a5c345c31a6449202fedd37a73fde6a6a4fda.tar.bz2 nixpkgs-133a5c345c31a6449202fedd37a73fde6a6a4fda.tar.lz nixpkgs-133a5c345c31a6449202fedd37a73fde6a6a4fda.tar.xz nixpkgs-133a5c345c31a6449202fedd37a73fde6a6a4fda.tar.zst nixpkgs-133a5c345c31a6449202fedd37a73fde6a6a4fda.zip | |
Merge pull request #74763 from nek0/restya-board-config-fix
restya-board: Restya board config fix
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/web-apps/restya-board.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index 2c2f36ac598..9d0a3f65253 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -116,7 +116,7 @@ in }; passwordFile = mkOption { - type = types.nullOr types.str; + type = types.nullOr types.path; default = null; description = '' The database user's password. 'null' if no password is set. @@ -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', '$(<${cfg.database.dbPassFile})');/g" "${runDir}/server/php/config.inc.php" + 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 ''} 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" |