Skip to content
This repository was archived by the owner on Apr 29, 2024. It is now read-only.

Commit 569fbb4

Browse files
committed
refactor: superuser for start-server/client
1 parent 10e99b1 commit 569fbb4

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

flake.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
]; in flake-utils.lib.eachSystem ourSystems (system:
2626
let
2727
pgsqlDefaultPort = "5435";
28+
pgsqlSuperuser = "postgres";
2829

2930
# The 'pkgs' variable holds all the upstream packages in nixpkgs, which
3031
# we can use to build our own images; it is the common name to refer to
@@ -261,6 +262,7 @@
261262
mkdir -p $out/bin
262263
substitute ${./tools/run-server.sh.in} $out/bin/start-postgres-server \
263264
--subst-var-by 'PGSQL_DEFAULT_PORT' '${pgsqlDefaultPort}' \
265+
--subst-var-by 'PGSQL_SUPERUSER' '${pgsqlSuperuser}' \
264266
--subst-var-by 'PSQL14_BINDIR' '${basePackages.psql_14.bin}' \
265267
--subst-var-by 'PSQL15_BINDIR' '${basePackages.psql_15.bin}' \
266268
--subst-var-by 'PSQL_CONF_FILE' '${configFile}' \
@@ -274,6 +276,7 @@
274276
mkdir -p $out/bin
275277
substitute ${./tools/run-client.sh.in} $out/bin/start-postgres-client \
276278
--subst-var-by 'PGSQL_DEFAULT_PORT' '${pgsqlDefaultPort}' \
279+
--subst-var-by 'PGSQL_SUPERUSER' '${pgsqlSuperuser}' \
277280
--subst-var-by 'PSQL14_BINDIR' '${basePackages.psql_14.bin}' \
278281
--subst-var-by 'PSQL15_BINDIR' '${basePackages.psql_15.bin}'
279282
chmod +x $out/bin/start-postgres-client

tools/run-client.sh.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ fi
2020
export PATH=$BINDIR/bin:$PATH
2121

2222
PORTNO="${2:-@PGSQL_DEFAULT_PORT@}"
23+
PGSQL_SUPERUSER=@PGSQL_SUPERUSER@
2324

24-
exec psql -p "$PORTNO" -h localhost postgres
25+
exec psql -U "$PGSQL_SUPERUSER" -p "$PORTNO" -h localhost postgres

tools/run-server.sh.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ fi
1919

2020
export PATH=$BINDIR/bin:$PATH
2121

22+
PGSQL_SUPERUSER=@PGSQL_SUPERUSER@
2223
PSQL_CONF_FILE=@PSQL_CONF_FILE@
2324
PGSODIUM_GETKEY_SCRIPT=@PGSODIUM_GETKEY@
2425
PORTNO="${2:-@PGSQL_DEFAULT_PORT@}"
@@ -30,7 +31,7 @@ echo "NOTE: using temporary directory $DATDIR for data, which will not be remove
3031
echo "NOTE: you are free to re-use this data directory at will"
3132
echo
3233

33-
initdb -D "$DATDIR" --locale=C
34+
initdb -U "$PGSQL_SUPERUSER" -D "$DATDIR" --locale=C
3435

3536
echo "NOTE: patching postgresql.conf files"
3637
sed \

0 commit comments

Comments
 (0)