Skip to content

Commit 657eb4a

Browse files
committed
tmp
1 parent 4a51dd5 commit 657eb4a

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

nix/ext/vault.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ stdenv.mkDerivation rec {
2020
installPhase = ''
2121
mkdir -p $out/{lib,share/postgresql/extension}
2222
23-
cp sql/*.sql $out/share/postgresql/extension
24-
cp *.control $out/share/postgresql/extension
23+
install -D *${postgresql.dlSuffix} $out/lib
24+
install -D -t $out/share/postgresql/extension sql/*.sql
25+
install -D -t $out/share/postgresql/extension *.control
2526
'';
2627

2728
meta = with lib; {

nix/tests/postgresql.conf.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ default_text_search_config = 'pg_catalog.english'
718718

719719
#local_preload_libraries = ''
720720
#session_preload_libraries = ''
721-
shared_preload_libraries = 'pg_stat_statements, pgaudit, plpgsql, plpgsql_check, pg_cron, pg_net, pgsodium, timescaledb, auto_explain, pg_tle, plan_filter, pg_backtrace' # (change requires restart)
721+
shared_preload_libraries = 'pg_stat_statements, pgaudit, plpgsql, plpgsql_check, pg_cron, pg_net, pgsodium, timescaledb, auto_explain, pg_tle, plan_filter, pg_backtrace, supabase_vault, supautils' # (change requires restart)
722722
jit_provider = 'llvmjit' # JIT library to use
723723

724724

nix/tools/run-server.sh.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ sed -e "1i\\
5555
include = '$DATDIR/supautils.conf'" \
5656
-e "\$a\\
5757
pgsodium.getkey_script = '$PGSODIUM_GETKEY_SCRIPT'" \
58+
-e "\$a\\
59+
vault.getkey_script = '$PGSODIUM_GETKEY_SCRIPT'" \
5860
-e "s|data_directory = '/var/lib/postgresql/data'|data_directory = '$DATDIR'|" \
5961
-e "s|hba_file = '/etc/postgresql/pg_hba.conf'|hba_file = '$DATDIR/pg_hba.conf'|" \
6062
-e "s|ident_file = '/etc/postgresql/pg_ident.conf'|ident_file = '$DATDIR/pg_ident.conf'|" \

0 commit comments

Comments
 (0)