Skip to content

Commit 2c51752

Browse files
committed
test: include supautils conf
1 parent d8c6c41 commit 2c51752

File tree

3 files changed

+21
-8
lines changed

3 files changed

+21
-8
lines changed

flake.nix

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -407,18 +407,29 @@
407407
# Start a version of the server.
408408
start-server =
409409
let
410-
configFile = ./nix/tests/postgresql.conf.in;
410+
pgconfigFile = ./nix/tests/postgresql.conf.in;
411+
supautilsConfigFile = builtins.path {
412+
name = "supautils.conf";
413+
path = ./ansible/files/postgresql_config/supautils.conf.j2;
414+
};
411415
getkeyScript = ./nix/tests/util/pgsodium_getkey.sh;
412416
in
413417
pkgs.runCommand "start-postgres-server" { } ''
414-
mkdir -p $out/bin
418+
mkdir -p $out/bin $out/etc/postgresql-custom
419+
echo "Copying from: ${supautilsConfigFile}"
420+
echo "Copying to: $out/etc/postgresql-custom/supautils.conf"
421+
cp ${supautilsConfigFile} $out/etc/postgresql-custom/supautils.conf || { echo "Failed to copy supautils.conf"; exit 1; }
422+
echo "Copy operation completed"
423+
chmod 644 $out/etc/postgresql-custom/supautils.conf
424+
cat $out/etc/postgresql-custom/supautils.conf
415425
substitute ${./nix/tools/run-server.sh.in} $out/bin/start-postgres-server \
416426
--subst-var-by 'PGSQL_DEFAULT_PORT' '${pgsqlDefaultPort}' \
417427
--subst-var-by 'PGSQL_SUPERUSER' '${pgsqlSuperuser}' \
418428
--subst-var-by 'PSQL15_BINDIR' '${basePackages.psql_15.bin}' \
419-
--subst-var-by 'PSQL_CONF_FILE' '${configFile}' \
420-
--subst-var-by 'PGSODIUM_GETKEY' '${getkeyScript}'
421-
429+
--subst-var-by 'PSQL_CONF_FILE' '${pgconfigFile}' \
430+
--subst-var-by 'PGSODIUM_GETKEY' '${getkeyScript}' \
431+
--subst-var-by 'SUPAUTILS_CONF_FILE' "$out/etc/postgresql-custom/supautils.conf"
432+
422433
chmod +x $out/bin/start-postgres-server
423434
'';
424435

nix/tests/postgresql.conf.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ default_text_search_config = 'pg_catalog.english'
717717

718718
#local_preload_libraries = ''
719719
#session_preload_libraries = ''
720-
shared_preload_libraries = 'auto_explain,pgsodium'
720+
shared_preload_libraries = 'pg_stat_statements, pg_stat_monitor, pgaudit, plpgsql, plpgsql_check, pg_cron, pg_net, pgsodium, timescaledb, auto_explain, pg_tle, plan_filter'
721721
#jit_provider = 'llvmjit' # JIT library to use
722722

723723
# - Other Defaults -
@@ -791,5 +791,5 @@ shared_preload_libraries = 'auto_explain,pgsodium'
791791
#------------------------------------------------------------------------------
792792

793793
# Add settings for extensions here
794-
794+
include = '@SUPAUTILS_CONFIG_FILE@'
795795
pgsodium.getkey_script = '@PGSODIUM_GETKEY_SCRIPT@'

nix/tools/run-server.sh.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ PSQL_CONF_FILE=@PSQL_CONF_FILE@
2828
PGSODIUM_GETKEY_SCRIPT=@PGSODIUM_GETKEY@
2929
PORTNO="${2:-@PGSQL_DEFAULT_PORT@}"
3030
PLJAVA_LIBJVM_LOCATION=@LIBJVM_LOCATION@
31+
SUPAUTILS_CONFIG_FILE=@SUPAUTILS_CONF_FILE@
3132
DATDIR=$(mktemp -d)
3233
mkdir -p "$DATDIR"
3334

@@ -42,6 +43,7 @@ echo "NOTE: patching postgresql.conf files"
4243
echo "pljava libjvm location: $PLJAVA_LIBJVM_LOCATION"
4344
sed -e "s#@PGSODIUM_GETKEY_SCRIPT@#$PGSODIUM_GETKEY_SCRIPT#g" \
4445
-e "s#@PLJAVA_LIBJVM_LOCATION@#$PLJAVA_LIBJVM_LOCATION#g" \
46+
-e "s#@SUPAUTILS_CONFIG_FILE@#$SUPAUTILS_CONFIG_FILE#g" \
4547
$PSQL_CONF_FILE > "$DATDIR/postgresql.conf"
46-
48+
cat $DATDIR/postgresql.conf
4749
exec postgres -p "$PORTNO" -D "$DATDIR" -k /tmp

0 commit comments

Comments
 (0)