about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorSander van der Burg <svanderburg@gmail.com>2017-12-20 21:45:07 +0100
committerSander van der Burg <svanderburg@gmail.com>2017-12-20 21:45:47 +0100
commit150e2b56212dbbe814735f27174c2ef07ac24464 (patch)
tree47c85633a38e360f630871e2e331d7117c120e92 /nixos
parent1259c46cdeb00e27be01cc152c48d5c0cff9c2f5 (diff)
dysnomia module: use postgres as default user and always publish container properties
(cherry picked from commit 9cee2e5c95e748e6ead8d76a007872de74ecf030)
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/misc/dysnomia.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix
index df44d0a54866a..c5c41ad296dab 100644
--- a/nixos/modules/services/misc/dysnomia.nix
+++ b/nixos/modules/services/misc/dysnomia.nix
@@ -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;
     }; }