dysnomia module: use postgres as default user and always publish container properties

This commit is contained in:
Sander van der Burg 2017-12-20 21:45:07 +01:00
parent 6b4687741e
commit 9cee2e5c95

View File

@ -192,9 +192,11 @@ in
mysqlPassword = builtins.readFile (config.services.mysql.rootPassword);
};
}
// lib.optionalAttrs (config.services.postgresql.enable && cfg.enableAuthentication) { postgresql-database = {
postgresqlUsername = "root";
}; }
// lib.optionalAttrs (config.services.postgresql.enable) { postgresql-database = {
} // lib.optionalAttrs (cfg.enableAuthentication) {
postgresqlUsername = "postgres";
};
}
// lib.optionalAttrs (config.services.tomcat.enable) { tomcat-webapplication = {
tomcatPort = 8080;
}; }