revert: revert PR 1971

Author: hunleyd

Dockerfile-15

@@ -218,6 +218,7 @@ COPY --chown=postgres:postgres ansible/files/walg_helper_scripts/wal_fetch.sh /h
 COPY ansible/files/walg_helper_scripts/wal_change_ownership.sh /root/wal_change_ownership.sh
 
 RUN sed -i \
+    -e "s|#unix_socket_directories = '/tmp'|unix_socket_directories = '/var/run/postgresql'|g" \
     -e "s|#session_preload_libraries = ''|session_preload_libraries = 'supautils'|g" \
     -e "s|#include = '/etc/postgresql-custom/supautils.conf'|include = '/etc/postgresql-custom/supautils.conf'|g" \
     /etc/postgresql/postgresql.conf && \

Dockerfile-17

@@ -222,6 +222,7 @@ COPY --chown=postgres:postgres ansible/files/walg_helper_scripts/wal_fetch.sh /h
 COPY ansible/files/walg_helper_scripts/wal_change_ownership.sh /root/wal_change_ownership.sh
 
 RUN sed -i \
+    -e "s|#unix_socket_directories = '/tmp'|unix_socket_directories = '/var/run/postgresql'|g" \
     -e "s|#session_preload_libraries = ''|session_preload_libraries = 'supautils'|g" \
     -e "s|#include = '/etc/postgresql-custom/supautils.conf'|include = '/etc/postgresql-custom/supautils.conf'|g" \
     /etc/postgresql/postgresql.conf && \

Dockerfile-orioledb-17

@@ -222,6 +222,7 @@ COPY --chown=postgres:postgres ansible/files/walg_helper_scripts/wal_fetch.sh /h
 COPY ansible/files/walg_helper_scripts/wal_change_ownership.sh /root/wal_change_ownership.sh
 
 RUN sed -i \
+    -e "s|#unix_socket_directories = '/tmp'|unix_socket_directories = '/var/run/postgresql'|g" \
     -e "s|#session_preload_libraries = ''|session_preload_libraries = 'supautils'|g" \
     -e "s|#include = '/etc/postgresql-custom/supautils.conf'|include = '/etc/postgresql-custom/supautils.conf'|g" \
     /etc/postgresql/postgresql.conf && \

…ble/files/database_optimizations.service …ble/files/database-optimizations.serviceansible/files/database_optimizations.service renamed to ansible/files/database-optimizations.service ansible/files/database_optimizations.service renamed to ansible/files/database-optimizations.service

@@ -15,7 +15,7 @@ check_orioledb_enabled() {
 }
 
 get_shared_buffers() {
-    local opt_conf="/etc/postgresql-custom/conf.d/generated_optimizations.conf"
+    local opt_conf="/etc/postgresql-custom/conf.d/generated-optimizations.conf"
     if [ ! -f "$opt_conf" ]; then
         return 0
     fi

ansible/files/postgres_prestart.sh.j2

@@ -64,7 +64,7 @@ listen_addresses = '*'		# what IP address(es) to listen on;
 #port = 5432				# (change requires restart)
 #max_connections = 100			# (change requires restart)
 #superuser_reserved_connections = 3	# (change requires restart)
-unix_socket_directories = '/var/run/postgresql'	# comma-separated list of directories
+#unix_socket_directories = '/tmp'	# comma-separated list of directories
 					# (change requires restart)
 #unix_socket_group = ''			# (change requires restart)
 #unix_socket_permissions = 0777		# begin with 0 to use octal notation

ansible/files/postgresql_config/postgresql.conf.j2

@@ -2,8 +2,8 @@
 Description=PostgreSQL database server
 Documentation=man:postgres(1)
 {% if supabase_internal is defined %}
-Requires=database_optimizations.service
-After=database_optimizations.service
+Requires=database-optimizations.service
+After=database-optimizations.service
 {% endif %}
 
 [Service]

ansible/files/postgresql_config/postgresql.service

@@ -147,11 +147,11 @@
         group: 'postgres'
         mode: '0664'
         owner: 'postgres'
-        path: "/etc/postgresql-custom/conf.d{{ pg_config_item }}"
+        path: "/etc/postgresql-custom/{{ pg_config_item }}"
         state: 'touch'
       loop:
-        - 'custom_overrides.conf'
-        - 'generated_optimizations.conf'
+        - 'custom-overrides.conf'
+        - 'generated-optimizations.conf'
       loop_control:
         loop_var: 'pg_config_item'
 
@@ -276,7 +276,7 @@
     dest: "/etc/systemd/system/{{ systemd_svc_item | basename }}"
     src: "files/{{ systemd_svc_item }}"
   loop:
-    - 'database_optimizations.service'
+    - 'database-optimizations.service'
     - 'postgresql_config/postgresql.service'
   loop_control:
     loop_var: 'systemd_svc_item'

ansible/tasks/setup-postgres.yml

@@ -75,6 +75,20 @@
     state: 'directory'
   become: true
 
+- name: Include file for generated optimizations in postgresql.conf
+  ansible.builtin.replace:
+    path: '/etc/postgresql/postgresql.conf'
+    regexp: "#include = '/etc/postgresql-custom/generated-optimizations.conf'"
+    replace: "include = '/etc/postgresql-custom/generated-optimizations.conf'"
+  become: true
+
+- name: Include file for custom overrides in postgresql.conf
+  ansible.builtin.replace:
+    path: '/etc/postgresql/postgresql.conf'
+    regexp: "#include = '/etc/postgresql-custom/custom-overrides.conf'"
+    replace: "include = '/etc/postgresql-custom/custom-overrides.conf'"
+  become: true
+
 - name: Install Postgres exporter
   ansible.builtin.import_tasks:
     file: internal/postgres-exporter.yml

ansible/tasks/setup-supabase-internal.yml

@@ -62,7 +62,7 @@ listen_addresses = '*'		# what IP address(es) to listen on;
 #port = @PGSQL_DEFAULT_PORT@				# (change requires restart)
 max_connections = 100			# (change requires restart)
 #superuser_reserved_connections = 3	# (change requires restart)
-unix_socket_directories = '/var/run/postgresql'	# comma-separated list of directories
+unix_socket_directories = '/tmp'	# comma-separated list of directories
 					# (change requires restart)
 #unix_socket_group = ''			# (change requires restart)
 #unix_socket_permissions = 0777		# begin with 0 to use octal notation