refactor(postgresql.conf): configure postgresql.conf to use 'include_…dir' directive #1843

hunleyd · 2025-10-14T13:46:22Z

What kind of change does this PR introduce?

Moved all config files that are included in the postgresql.conf into the /etc/postgresql-custom dir then updated postgresql.conf to use include_dir instead of include. To ensure the same ordering of the various GUCs (to ensure proper overriding of values), rename files with digits prepended.
Finally, split auto_explain and pg_cron out into their own config files instead of them being tacked on the end of the main PG config.

this is take 2, which should fix the supautils issue

…dir' directive and move logging.conf into the postgresql-customer dir

… preserve ordering

…wn config files

* 'develop' of github.com:supabase/postgres: (29 commits) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1818) fix: update Dockerfiles for changes to postgis multiversion (#1817) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1813) feat: support multiple versions of the postgis extension (#1667) Update pgsql-http to handle semver (#1816) feat: add retry policy for auth service routes (#1782) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1811) fix: move tmpdir for SAA to one that always exists (#1799) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1810) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1809) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1807) build: automatically cancel old tests/build on new push (#1808) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1804) docs: small adjust (#1806) docs: getting started guide in README (#1805) fix: templating of SAA service file fix: adjust the qemu vars filename refactor(ansible): bring our ansible up to modern ansible-lint standards feat: support multiple versions of the http extension (#1664) feat: supply a slightly different supabase-admin-agent configuration for qemu artifacts ...

…lute path

…les to ensure ordering

* origin/develop: fix(nix): remove '%' character from Nix trusted-public-keys configuration (#1840) chore: systemd hardening (#1837) Revert "refactor(postgresq): switch to 'include_dir' and then rename conf files to ensure ordering" (#1835) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1821) fix(pgmq): replace drop_queue function if exists (#1828) refactor(postgresq): switch to 'include_dir' and then renames conf files to ensure ordering (#1820) feat: support multiple versions of the pg_jsonschema extension (#1757) feat: bump auth to v2.180.0 (#1829) feat: update supautils confs w/ new tables feat(migrations): predefined role grants (#1815) feat: run pg_regress tests after installing the last version of the extension (#1826) fix(pgmq): add missing helper function in migration script (#1825) feat: support multiple versions of the pgmq extension (#1668) feat: run pg_regress during extension tests (#1812) feat: support multiple versions of the pgrouting extension (#1687) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1819) feat: support multiple versions of the pg-graphql extension (#1761)

…e numeric prefixes as per Sam

…vars

…ions

* fix: refactor tests to work with include_dir approach and be more accurate with production conditions * tests: use distinct savepoint names in test

* origin: refactor(ansible): bring our ansible up to modern ansible-lint standards (#1852) chore: bump to release (#1855) docs: getting started nix install or config revised (#1853) docs: how to update new structure (#1851) feat: support multiple versions of the plpgsql_check extension (#1684) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1848) feat(wrappers): support more versions (#1831) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1833) fix: fine tune protection rules to unblock wal-g functionality (#1846) fix: incorporate v3.0.0 supautils (#1844) fix: remove git revision from postgres package

samrose · 2025-10-23T16:01:07Z

@hunleyd this is still in draft mode of course. But requesting that once we are ready for review, we need @soedirgo @steve-chavez @za-arthur and myself to review before we merge and deploy just due to all of the changes.

…somehow ;)

* origin/develop: feat: support multiple versions of the plv8 extension (#1676) chore: bump wrappers version 0.5.6 (#1877) feat: support multiple versions of the pg_hashids extension (#1755)

* origin: feat: update supautils (#1879)

* origin: refactor(ansible): bring our ansible up to modern ansible-lint standards (#1869)

* origin: feat: enable GitHub merge queues (#1849)

…-152 * 'INDATA-152' of github.com:supabase/postgres: fix: change trigger to `merge_group` in "Release Migrations - Staging / build (push)" workflow (#1884) tests: newline readme (#1883)

This reverts commit bd512ff.

* origin: fix: we won't deploy this newest version of plv8 yet (#1885)

…-152 * 'INDATA-152' of github.com:supabase/postgres: Revert "test(pg_regress): update expected output for pg15 plv8"

samrose

Going to run through a multi step testing checklist with @jchancojr prior to merging this

Basically

specific pg_regress tests for configuration

local infra testing of pause/restore, upgrade to this image, overall functionality

Run through internal integration of image

A few review items from Sam on this PR that will be added to the actual PR here

jchancojr · 2025-11-08T15:33:10Z

getting supautils related errors

postgres@db-wfcgdcogpuhyxlzxaiur:~$ psql
WARNING:  invalid configuration parameter name "supautils.disable_program", removing it
DETAIL:  "supautils" is now a reserved prefix.

hunleyd and others added 25 commits October 6, 2025 11:23

refactor(postgresql.conf): configure postgresql.conf to use 'include_…

07ab014

…dir' directive and move logging.conf into the postgresql-customer dir

refactor(ansible): rename all conf files in /etc/postgresql-custom to…

e0426ee

… preserve ordering

refactor(postgresql): split auto_explain and pg_cron out into their o…

7876920

…wn config files

fix(nix): it helps to use the correct filename everywhere

0c932e9

refactor(postgresql.conf): use relative path to include_dir

6ce9f8b

fix(postgresql.conf): revert the location of include_dir back to abso…

b2a64fd

…lute path

refactor(postgresql): switch to 'include_dir' and then rename conf fi…

d4092d8

…les to ensure ordering

refactor(docker): don't sed, just echo

a01355d

fix: test harness needed to handle config files correctly

e95145a

refactor(PG-configuration): move includes to conf.d and rename wth th…

161cd90

…e numeric prefixes as per Sam

fix(nix): nix doesn't like it when you try to assign vars to undef'd …

f18cd9e

…vars

fix: update path to 05-supautils

100a6e1

fix: update path to 00-logging

c51b05e

refactor(postgresql): mv 00-logging.conf to just logging.conf

55c0ea7

refactor(postgres): 01-generated-optimizations -> generated-optimizat…

bf4c03e

…ions

refactor(postgresql): 02-custom-overrides -> custom-overrides

fcf4c28

refactor(postgres): 03-wal-g -> wal-g

fdb7898

refactor(postgres): 04-read-replica -> read-replica

b96ed46

refactor(postgres): 05-supautils -> supautils

bf0133c

style(postgresql): style fixups

da987d4

fix: more path updates

9bba13d

Indata 152 run server (#1850)

1f82f5b

* fix: refactor tests to work with include_dir approach and be more accurate with production conditions * tests: use distinct savepoint names in test

hunleyd requested review from samrose, soedirgo, steve-chavez and za-arthur October 24, 2025 13:53

fix(setup-wal-g): remove errant stale task from a bad upstream merge

2b0208f

hunleyd changed the title ~~refactor(postgresql.conf): configure postgresql.conf to use 'include_…dir' directive and move logging.conf into the postgresql-customer dir~~ refactor(postgresql.conf): configure postgresql.conf to use 'include_…dir' directive Oct 29, 2025

hunleyd and others added 16 commits October 29, 2025 11:55

fix(setup-wal-g): s/postgresq/postgres/

d0be984

test(ami-versions): bump the ami versions so i can run the infra tests

b23b403

test(ansible): revert my custom build numbers since the GHA all pass …

df9cd4e

…somehow ;)

Merge remote-tracking branch 'origin/develop' into INDATA-152

2a0b3c3

* origin/develop: feat: support multiple versions of the plv8 extension (#1676) chore: bump wrappers version 0.5.6 (#1877) feat: support multiple versions of the pg_hashids extension (#1755)

Merge remote-tracking branch 'origin' into INDATA-152

cae0c5e

* origin: feat: update supautils (#1879)

fix(prime.sql): typo

644f98b

Merge remote-tracking branch 'origin' into INDATA-152

2ba0d3e

* origin: refactor(ansible): bring our ansible up to modern ansible-lint standards (#1869)

test(pg_regress): add updated expected test outputs

d9fc2d4

Merge remote-tracking branch 'origin' into INDATA-152

5a76416

* origin: feat: enable GitHub merge queues (#1849)

Merge branch 'develop' into INDATA-152

51a4078

test(pg_regress): update expected output for pg15 plv8

bd512ff

Merge branch 'INDATA-152' of github.com:supabase/postgres into INDATA…

74e347f

…-152 * 'INDATA-152' of github.com:supabase/postgres: fix: change trigger to `merge_group` in "Release Migrations - Staging / build (push)" workflow (#1884) tests: newline readme (#1883)

Revert "test(pg_regress): update expected output for pg15 plv8"

b2e170b

This reverts commit bd512ff.

Merge remote-tracking branch 'origin' into INDATA-152

2c3acd2

* origin: fix: we won't deploy this newest version of plv8 yet (#1885)

Merge branch 'INDATA-152' of github.com:supabase/postgres into INDATA…

6336a0e

…-152 * 'INDATA-152' of github.com:supabase/postgres: Revert "test(pg_regress): update expected output for pg15 plv8"

fix(stage2-setup-postgres): supautils.conf is in conf.d now

8aecdab

hunleyd marked this pull request as ready for review November 2, 2025 01:50

hunleyd requested review from a team as code owners November 2, 2025 01:50

samrose requested changes Nov 5, 2025

View reviewed changes

jchancojr and others added 6 commits November 7, 2025 12:25

refactor(supautils.conf): fix conflicts

ca26f5d

Merge branch 'develop' of github.com:supabase/postgres into INDATA-152

d739f5e

chore: bump version

db993d5

Merge branch 'develop' into INDATA-152

1de71e0

test(pg_regress): update pg_regress pg roles tests

be3a93c

Merge branch 'develop' into INDATA-152

bb62512

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

refactor(postgresql.conf): configure postgresql.conf to use 'include_…dir' directive #1843

refactor(postgresql.conf): configure postgresql.conf to use 'include_…dir' directive #1843

Uh oh!

hunleyd commented Oct 14, 2025

Uh oh!

samrose commented Oct 23, 2025

Uh oh!

samrose left a comment •

edited

Loading

Uh oh!

jchancojr commented Nov 8, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

refactor(postgresql.conf): configure postgresql.conf to use 'include_…dir' directive #1843

Are you sure you want to change the base?

refactor(postgresql.conf): configure postgresql.conf to use 'include_…dir' directive #1843

Uh oh!

Conversation

hunleyd commented Oct 14, 2025

Uh oh!

samrose commented Oct 23, 2025

Uh oh!

samrose left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jchancojr commented Nov 8, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

samrose left a comment •

edited

Loading