Skip to content

Revert "refactor(postgresq): switch to 'include_dir' and then rename conf files to ensure ordering" #1835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Oct 10, 2025
Merged

Revert "refactor(postgresq): switch to 'include_dir' and then rename conf files to ensure ordering" #1835

merged 2 commits into from
Oct 10, 2025

Conversation

@samrose
Copy link
Collaborator

@samrose samrose commented Oct 10, 2025

Reverts #1820

Likely this change will also need the following

diff --git a/ansible/files/postgresql_config/supautils.conf.j2 b/ansible/files/postgresql_config/supautils.conf.j2
index 43875c19..da3a6562 100644
--- a/ansible/files/postgresql_config/supautils.conf.j2
+++ b/ansible/files/postgresql_config/supautils.conf.j2
@@ -1,3 +1,4 @@
+session_preload_libraries = 'supautils'
 supautils.extensions_parameter_overrides = '{"pg_cron":{"schema":"pg_catalog"}}'
 supautils.policy_grants = '{"postgres":["auth.audit_log_entries","auth.flow_state","auth.identities","auth.instances","auth.mfa_amr_claims","auth.mfa_challenges","auth.mfa_factors","auth.oauth_clients","auth.one_time_tokens","auth.refresh_tokens","auth.saml_providers","auth.saml_relay_states","auth.sessions","auth.sso_domains","auth.sso_providers","auth.users","realtime.messages","realtime.subscription","storage.buckets","storage.buckets_analytics","storage.objects","storage.prefixes","storage.s3_multipart_uploads","storage.s3_multipart_uploads_parts"]}'
 supautils.drop_trigger_grants = '{"postgres":["auth.audit_log_entries","auth.flow_state","auth.identities","auth.instances","auth.mfa_amr_claims","auth.mfa_challenges","auth.mfa_factors","auth.oauth_clients","auth.one_time_tokens","auth.refresh_tokens","auth.saml_providers","auth.saml_relay_states","auth.sessions","auth.sso_domains","auth.sso_providers","auth.users","realtime.messages","realtime.subscription","storage.buckets","storage.buckets_analytics","storage.objects","storage.prefixes","storage.s3_multipart_uploads","storage.s3_multipart_uploads_parts"]}'
diff --git a/ansible/tasks/internal/supautils.yml b/ansible/tasks/internal/supautils.yml
index 38e911f5..7dc813b3 100644
--- a/ansible/tasks/internal/supautils.yml
+++ b/ansible/tasks/internal/supautils.yml
@@ -32,13 +32,6 @@
     target: install
   become: yes
 
-- name: supautils - add supautils to session_preload_libraries
-  become: yes
-  replace:
-    path: /etc/postgresql/postgresql.conf
-    regexp: "#session_preload_libraries = ''"
-    replace: session_preload_libraries = 'supautils'
-
 - name: supautils - write custom 05-supautils.conf
   template:
     src: "files/postgresql_config/supautils.conf.j2"

reverting to unblock and will follow up to see if we can apply the above fix and get better config testing coverage too

@samrose samrose requested review from a team as code owners October 10, 2025 19:29
@linear
Copy link

linear bot commented Oct 10, 2025

Issue reopened: INDATA-152 configure PG to use include_dir and move logging.conf to the dir

@samrose samrose requested a review from Copilot October 10, 2025 19:36
Copilot AI reviewed Oct 10, 2025
View reviewed changes
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR reverts a previous change that switched PostgreSQL configuration files to use include_dir with numbered prefixes for file ordering. The revert restores the previous approach of using explicit include statements for individual configuration files without numerical prefixes.

  • Removes the include_dir approach and returns to explicit include statements in postgresql.conf
  • Removes numerical prefixes from configuration file names (e.g., 05-supautils.conf → supautils.conf)
  • Consolidates auto_explain and pg_cron settings directly into the main postgresql.conf file

Reviewed Changes

Copilot reviewed 18 out of 18 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
nix/tools/run-server.sh.in Reverts Nix build script to use individual config files without numbered prefixes
nix/packages/lib.nix Updates Nix package configuration to remove references to deleted config files
ansible/tasks/*.yml Updates Ansible tasks to use config files without numerical prefixes
ansible/files/postgresql_config/postgresql.conf.j2 Adds explicit include statements and moves auto_explain/pg_cron settings inline
ansible/files/postgresql_config/*.conf Removes separate auto_explain and pg_cron config files
Dockerfile-* Updates Docker builds to use config files without numerical prefixes

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

@samrose samrose merged commit 309557b into develop Oct 10, 2025
14 checks passed
@samrose samrose deleted the revert-1820-INDATA-152 branch October 10, 2025 21:08
hunleyd added a commit that referenced this pull request Oct 14, 2025
@hunleyd
Merge remote-tracking branch 'origin/develop' into INDATA-152
1e6a7d0 
* 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)
encima pushed a commit that referenced this pull request Oct 28, 2025
@samrose @encima
Revert "refactor(postgresq): switch to 'include_dir' and then rename …
ab56d53 
…conf files to ensure ordering" (#1835)

* Revert "refactor(postgresq): switch to 'include_dir' and then renames conf fi…"

This reverts commit 0987406.

* chore: bump version to create release from this branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@tgallacher tgallacher tgallacher approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@samrose @tgallacher