improvements to system initializer listener

wizard-server/src/main/java/org/cobbzilla/wizard/server/config/PgRestServerConfiguration.java

@@ -56,12 +56,12 @@ public class PgRestServerConfiguration extends RestServerConfiguration implement
 
     public static boolean dbExists(String db) {
         if (!checkSafeShellArg(db)) return die("dbExists: invalid db name: "+db);
-        return execScript("echo \"select datname from pg_database where datname='" + db + "'\" | psql -qt").trim().equals(db);
+        return execScript("echo \"select datname from pg_database where datname='" + db + "'\" | psql -qt template1").trim().equals(db);
     }
 
     public static boolean dbUserExists(String user) {
         if (!checkSafeShellArg(user)) return die("dbUserExists: invalid db user name: "+user);
-        return execScript("echo \"select usename from pg_user where usename='" + user + "'\" | psql -qt").trim().equals(user);
+        return execScript("echo \"select usename from pg_user where usename='" + user + "'\" | psql -qt template1").trim().equals(user);
     }
 
     @Override @Bean public DatabaseConfiguration getDatabase() { return database; }

wizard-server/src/main/java/org/cobbzilla/wizard/server/listener/SystemInitializerListener.java

@@ -84,11 +84,10 @@ public class SystemInitializerListener extends RestServerLifecycleListenerBase {
             if (!dbUserExists(user)) {
                 execScript("createuser --createdb --no-createrole --no-superuser --no-replication "+user);
                 if (!dbUserExists(user)) die(PREFIX+"error creating '"+user+"' database user");
-
-                execScript("echo \"ALTER USER bubble WITH PASSWORD '"+ password +"'\" | psql");
             } else {
                 log.info("DB user '"+user+"' exists, not creating");
             }
+            execScript("echo \"ALTER USER bubble WITH PASSWORD '"+ password +"'\" | psql template1");
 
         } catch (Exception e) {
             die(PREFIX+"Error initializing database: "+shortError(e));