fixup: use default dbname

penguincoder · Jul 21, 2023 · b2ac383 · b2ac383
1 parent b0ba749
commit b2ac383
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/modules/services/postgres.nix b/src/modules/services/postgres.nix
@@ -29,7 +29,7 @@ let
           echo $dbAlreadyExists
           if [ 1 -ne "$dbAlreadyExists" ]; then
             echo "Creating database: ${database.name}"
-            echo 'create database "${database.name}";' | psql
+            echo 'create database "${database.name}";' | psql --dbname postgres
 
 
             ${lib.optionalString (database.schema != null) ''
@@ -57,12 +57,12 @@ let
         cfg.initialDatabases)
     else
       lib.optionalString cfg.createDatabase ''
-        echo "CREATE DATABASE ''${USER:-$(id -nu)};" | psql '';
+        echo "CREATE DATABASE ''${USER:-$(id -nu)};" | psql --dbname postgres'';
 
   runInitialScript =
     if cfg.initialScript != null then
       ''
-        echo ${lib.escapeShellArg cfg.initialScript} | psql
+        echo ${lib.escapeShellArg cfg.initialScript} | psql --dbname postgres
       ''
     else
       "";
@@ -85,23 +85,29 @@ let
 
     if [[ ! -d "$PGDATA" ]]; then
       initdb ${lib.concatStringsSep " " cfg.initdbArgs}
+      echo
       echo "PostgreSQL init process complete; ready for start up."
+      echo
     fi
 
     # Setup config
     cp ${configFile} "$PGDATA/postgresql.conf"
 
     if [[ ! -f "$PGDATA/.configured" ]]; then
       touch "$PGDATA/.configured"
+      echo
       echo "PostgreSQL appears unconfigured; going to run initialization scripts."
+      echo
 
       pg_ctl -D "$PGDATA" -w start
       ${setupInitialDatabases}
 
       ${runInitialScript}
       pg_ctl -D "$PGDATA" -m fast -w stop
     else
+      echo
       echo "PostgreSQL Database directory appears to contain a database; Skipping initialization"
+      echo
     fi
   '';
   startScript = pkgs.writeShellScriptBin "start-postgres" ''