diff --git a/.gitignore b/.gitignore index e2f0c6a70..efd77839a 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,5 @@ docker-compose.override.yml /.envrc /.direnv + +/config/master.key diff --git a/flake.nix b/flake.nix index d64988fc7..26ece812e 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ overlays = [ (final: prev: { nodejs = prev.nodejs_20; - postgresql = prev.postgresql_15; + postgresql = prev.postgresql_16; ruby = (prev.ruby_3_3.withPackages (ps: with ps; [ psych ])); diff --git a/run-services.sh b/run-services.sh index f100537a8..ac60ba564 100755 --- a/run-services.sh +++ b/run-services.sh @@ -2,8 +2,8 @@ set -e -if ! pg_ctl -D ./postgres/15 status; then - pg_ctl -D ./postgres/15 -l ./postgres/postgresql.log start +if ! pg_ctl -D ./postgres/16 status; then + pg_ctl -D ./postgres/16 -l ./postgres/postgresql.log start fi redis-server > ./redis/redis.log 2> ./redis/redis.err & @@ -18,4 +18,4 @@ for pid in $(jobs -p); do kill -9 $pid done -pg_ctl -D ./postgres/15 stop +pg_ctl -D ./postgres/16 stop