@@ -427,7 +427,7 @@ in {
427427 then ''"$(<"${toString c.dbpassFile}")"''
428428 else if c.dbpass != null
429429 then ''"${toString c.dbpass}"''
430− else null;
430+ else ''""'';
431431 adminpass = if c.adminpassFile != null
432432 then ''"$(<"${toString c.adminpassFile}")"''
433433 else ''"${toString c.adminpass}"'';
@@ -441,8 +441,7 @@ in {
441441 ${if c.dbhost != null then "--database-host" else null} = ''"${c.dbhost}"'';
442442 ${if c.dbport != null then "--database-port" else null} = ''"${toString c.dbport}"'';
443443 ${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"'';
444− ${if (any (x: x != null) [c.dbpass c.dbpassFile])
445− then "--database-pass" else null} = dbpass;
444+ "--database-pass" = dbpass;
446445 ${if c.dbtableprefix != null
447446 then "--database-table-prefix" else null} = ''"${toString c.dbtableprefix}"'';
448447 "--admin-user" = ''"${c.adminuser}"'';