mirror of
https://git.asonix.dog/ceralor/mastodon.git
synced 2025-10-12 21:34:27 +00:00
Update postgres, .gitignore
This commit is contained in:
parent
1e38840a74
commit
e27a39490c
3 changed files with 6 additions and 4 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -77,3 +77,5 @@ docker-compose.override.yml
|
||||||
|
|
||||||
/.envrc
|
/.envrc
|
||||||
/.direnv
|
/.direnv
|
||||||
|
|
||||||
|
/config/master.key
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
overlays = [
|
overlays = [
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
nodejs = prev.nodejs_20;
|
nodejs = prev.nodejs_20;
|
||||||
postgresql = prev.postgresql_15;
|
postgresql = prev.postgresql_16;
|
||||||
ruby = (prev.ruby_3_3.withPackages (ps: with ps; [
|
ruby = (prev.ruby_3_3.withPackages (ps: with ps; [
|
||||||
psych
|
psych
|
||||||
]));
|
]));
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
if ! pg_ctl -D ./postgres/15 status; then
|
if ! pg_ctl -D ./postgres/16 status; then
|
||||||
pg_ctl -D ./postgres/15 -l ./postgres/postgresql.log start
|
pg_ctl -D ./postgres/16 -l ./postgres/postgresql.log start
|
||||||
fi
|
fi
|
||||||
|
|
||||||
redis-server > ./redis/redis.log 2> ./redis/redis.err &
|
redis-server > ./redis/redis.log 2> ./redis/redis.err &
|
||||||
|
@ -18,4 +18,4 @@ for pid in $(jobs -p); do
|
||||||
kill -9 $pid
|
kill -9 $pid
|
||||||
done
|
done
|
||||||
|
|
||||||
pg_ctl -D ./postgres/15 stop
|
pg_ctl -D ./postgres/16 stop
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue