Merge pull request #2 from clearpathrobotics/CORE-21733-dev-environment-changes

Move postgres host and port to a single location.

Author: iwanders

flake.nix

@@ -624,7 +624,10 @@
             export HYDRA_HOME="$(pwd)/src/"
             mkdir -p .hydra-data
             export HYDRA_DATA="$(pwd)/.hydra-data"
-            export HYDRA_DBI='dbi:Pg:dbname=hydra;host=localhost;port=64444'
+            export LOGNAME="hydra-dev"
+            export PGPORT=64444
+            export PGHOST="localhost"
+            export HYDRA_DBI="dbi:Pg:dbname=hydra;host=$PGHOST;port=$PGPORT"
 
             popd >/dev/null
           '';

foreman/start-hydra.sh

@@ -1,15 +1,15 @@
 #!/bin/sh
 
 # wait for postgresql to listen
-while ! pg_isready -h $(pwd)/.hydra-data/postgres -p 64444; do sleep 1; done
+while ! pg_isready ; do sleep 1; done
 
-createdb -h $(pwd)/.hydra-data/postgres -p 64444 hydra
+createdb hydra
 
 # create a db for the default user. Not sure why, but
 # the terminal is otherwise spammed with:
 #
 #     FATAL:  database "USERNAME" does not exist
-createdb -h $(pwd)/.hydra-data/postgres -p 64444 "$(whoami)" || true
+createdb "$(whoami)" || true
 
 hydra-init
 hydra-create-user alice --password foobar --role admin

foreman/start-postgres.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 initdb ./.hydra-data/postgres
-exec postgres -D ./.hydra-data/postgres -k $(pwd)/.hydra-data/postgres -p 64444
+exec postgres -D ./.hydra-data/postgres -k $(pwd)/.hydra-data/postgres -p ${PGPORT}