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

Commit 65eaf49

Browse files
committed
pass config to start-postgres-server
1 parent dd128f6 commit 65eaf49

File tree

2 files changed

+24
-8
lines changed

2 files changed

+24
-8
lines changed

flake.nix

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -251,14 +251,22 @@
251251
psql_15 = makePostgres "15";
252252

253253
# Start a version of the server.
254-
start-server = pkgs.runCommand "start-postgres-server" {} ''
255-
mkdir -p $out/bin
256-
substitute ${./tools/run-server.sh.in} $out/bin/start-postgres-server \
257-
--subst-var-by 'PGSQL_DEFAULT_PORT' '${pgsqlDefaultPort}' \
258-
--subst-var-by 'PSQL14_BINDIR' '${basePackages.psql_14.bin}' \
259-
--subst-var-by 'PSQL15_BINDIR' '${basePackages.psql_15.bin}'
260-
chmod +x $out/bin/start-postgres-server
261-
'';
254+
start-server =
255+
let
256+
configFile = ./tests/postgresql.conf.in;
257+
getkeyScript = ./tests/util/pgsodium_getkey.sh;
258+
in
259+
pkgs.runCommand "start-postgres-server" {} ''
260+
mkdir -p $out/bin
261+
substitute ${./tools/run-server.sh.in} $out/bin/start-postgres-server \
262+
--subst-var-by 'PGSQL_DEFAULT_PORT' '${pgsqlDefaultPort}' \
263+
--subst-var-by 'PSQL14_BINDIR' '${basePackages.psql_14.bin}' \
264+
--subst-var-by 'PSQL15_BINDIR' '${basePackages.psql_15.bin}' \
265+
--subst-var-by 'PSQL_CONF_FILE' '${configFile}' \
266+
--subst-var-by 'PGSODIUM_GETKEY' '${getkeyScript}'
267+
268+
chmod +x $out/bin/start-postgres-server
269+
'';
262270

263271
# Start a version of the client.
264272
start-client = pkgs.runCommand "start-postgres-client" {} ''

tools/run-server.sh.in

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ fi
1919

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

22+
PSQL_CONF_FILE=@PSQL_CONF_FILE@
23+
PGSODIUM_GETKEY_SCRIPT=@PGSODIUM_GETKEY@
2224
PORTNO="${2:-@PGSQL_DEFAULT_PORT@}"
2325
DATDIR=$(mktemp -d)
2426
mkdir -p "$DATDIR"
@@ -29,4 +31,10 @@ echo "NOTE: you are free to re-use this data directory at will"
2931
echo
3032

3133
initdb -D "$DATDIR" --locale=C
34+
35+
echo "NOTE: patching postgresql.conf files"
36+
sed \
37+
"s#@PGSODIUM_GETKEY_SCRIPT@#$PGSODIUM_GETKEY_SCRIPT#g" \
38+
$PSQL_CONF_FILE > "$DATDIR/postgresql.conf"
39+
3240
exec postgres -p "$PORTNO" -D "$DATDIR" -k /tmp

0 commit comments

Comments
 (0)