hscmgroup
diff --git a/‎ansible/files/generate-optimizations.service.j2
Lines changed: 3 additions & 2 deletions b/‎ansible/files/generate-optimizations.service.j2
Lines changed: 3 additions & 2 deletions
diff --git a/‎ansible/files/pgbouncer_config/pgbouncer.ini.j2
Lines changed: 3 additions & 0 deletions b/‎ansible/files/pgbouncer_config/pgbouncer.ini.j2
Lines changed: 3 additions & 0 deletions
diff --git a/‎ansible/files/pgbouncer_config/pgbouncer.service.j2
Lines changed: 6 additions & 26 deletions b/‎ansible/files/pgbouncer_config/pgbouncer.service.j2
Lines changed: 6 additions & 26 deletions
diff --git a/‎ansible/playbook.yml
Lines changed: 5 additions & 5 deletions b/‎ansible/playbook.yml
Lines changed: 5 additions & 5 deletions
diff --git a/‎ansible/tasks/internal/admin-api.yml
Lines changed: 1 addition & 1 deletion b/‎ansible/tasks/internal/admin-api.yml
Lines changed: 1 addition & 1 deletion
diff --git a/‎ansible/tasks/setup-pgbouncer.yml
Lines changed: 22 additions & 2 deletions b/‎ansible/tasks/setup-pgbouncer.yml
Lines changed: 22 additions & 2 deletions
diff --git a/‎ansible/tasks/setup-postgres.yml
Lines changed: 1 addition & 1 deletion b/‎ansible/tasks/setup-postgres.yml
Lines changed: 1 addition & 1 deletion
diff --git a/‎ansible/vars.yml
Lines changed: 3 additions & 3 deletions b/‎ansible/vars.yml
Lines changed: 3 additions & 3 deletions
diff --git a/‎common.vars.json
Lines changed: 1 addition & 1 deletion b/‎common.vars.json
Lines changed: 1 addition & 1 deletion
@@ -3,8 +3,9 @@ Description=Postgresql optimizations
 
 [Service]
 Type=oneshot
-# we don't want failures from this command to cause PG startup to fail
-ExecStart=/bin/bash -c "/opt/supabase-admin-api optimize db --destination-config-file-path /etc/postgresql-custom/generated-optimizations.conf ; exit 0"
+# we do not want failures from these commands to cause downstream service startup to fail
+ExecStart=-/opt/supabase-admin-api optimize db --destination-config-file-path /etc/postgresql-custom/generated-optimizations.conf
+ExecStart=-/opt/supabase-admin-api optimize pgbouncer --destination-config-file-path /etc/pgbouncer-custom/generated-optimizations.ini
 User=adminapi
 
 [Install]
 
@@ -358,3 +358,6 @@ default_pool_size = 15
 
 ;; Read additional config from other file
 ;%include /etc/pgbouncer/pgbouncer-other.ini
+
+%include /etc/pgbouncer-custom/generated-optimizations.ini
+%include /etc/pgbouncer-custom/custom-overrides.ini
@@ -1,40 +1,20 @@
-# Example systemd service unit for PgBouncer
-#
-# - Adjust the paths in ExecStart for your installation.
-#
-# - The User setting requires careful consideration.  PgBouncer needs
-#   to be able to place a Unix-domain socket file where PostgreSQL
-#   clients will look for it.  In the olden days, this was in /tmp,
-#   but systems using systemd now prefer something like
-#   /var/run/postgresql/.  But then some systems also lock down that
-#   directory so that only the postgres user can write to it.  That
-#   means you need to either
-#
-#   - run PgBouncer as the postgres user, or
-#
-#   - create a separate user and add it to the postgres group and
-#     make /var/run/postgresql/ group-writable, or
-#
-#   - use systemd to create the sockets; see pgbouncer.socket nearby.
-#
-#   For packagers and deployment systems, this requires some
-#   coordination between the PgBouncer and the PostgreSQL
-#   packages/components.
-#
 [Unit]
 Description=connection pooler for PostgreSQL
 Documentation=man:pgbouncer(1)
 Documentation=https://www.pgbouncer.org/
 After=network.target
-#Requires=pgbouncer.socket
+{% if supabase_internal is defined %}
+Requires=generate-optimizations.service
+After=generate-optimizations.service
+{% endif %}
 
 [Service]
 Type=notify
 User=pgbouncer
 ExecStart=/usr/local/bin/pgbouncer /etc/pgbouncer/pgbouncer.ini
 ExecReload=/bin/kill -HUP $MAINPID
 KillSignal=SIGINT
-#LimitNOFILE=1024
+LimitNOFILE=65536
 
 [Install]
-WantedBy=multi-user.target
 WantedBy=multi-user.target
@@ -29,6 +29,11 @@
     - name: Install Postgres extensions
       import_tasks: tasks/setup-extensions.yml
 
+    - name: Install PgBouncer
+      import_tasks: tasks/setup-pgbouncer.yml
+      tags:
+        - install-pgbouncer
+
     - name: Install Supabase specific content
       import_tasks: tasks/setup-supabase-internal.yml
       tags:
@@ -61,11 +66,6 @@
     - name: Install WAL-G
       import_tasks: tasks/setup-wal-g.yml
 
-    - name: Install PgBouncer
-      import_tasks: tasks/setup-pgbouncer.yml
-      tags:
-        - install-pgbouncer
-
     - name: Install PostgREST
       import_tasks: tasks/setup-postgrest.yml
       tags:
 
@@ -1,7 +1,7 @@
 - name: adminapi - system user
   user:
     name: adminapi
-    groups: root,admin,postgres
+    groups: root,admin,postgres,pgbouncer
     append: yes
 
 - name: disk script
 
@@ -41,22 +41,42 @@
     target: install
   become: yes
 
-# Create pgbouncer user
 - name: Create pgbouncer user
   user:
     name: pgbouncer
     shell: /bin/false
     comment: PgBouncer user
     groups: postgres,ssl-cert
 
-# Create /etc/postgresql directory and make sure postgres group owns it
 - name: PgBouncer - create a directory if it does not exist
   file:
     path: /etc/pgbouncer
     state: directory
     owner: pgbouncer
+    group: pgbouncer
     mode: '0700'
 
+- name: PgBouncer - create a directory if it does not exist
+  file:
+    state: directory
+    owner: pgbouncer
+    group: pgbouncer
+    path: '{{ item }}'
+    mode: '0775'
+  with_items:
+    - '/etc/pgbouncer-custom'
+
+- name: create placeholder config files
+  file:
+    path: '/etc/pgbouncer-custom/{{ item }}'
+    state: touch
+    owner: pgbouncer
+    group: pgbouncer
+    mode: 0664
+  with_items:
+    - 'generated-optimizations.ini'
+    - 'custom-overrides.ini'
+
 - name: PgBouncer - adjust pgbouncer.ini
   copy:
     src: files/pgbouncer_config/pgbouncer.ini.j2
 
@@ -103,7 +103,7 @@
   with_items:
     - '/etc/postgresql-custom'
 
-- name: create placeholder files
+- name: create placeholder config files
   file:
     path: '/etc/postgresql-custom/{{ item }}'
     state: touch
 
@@ -34,10 +34,10 @@ node_exporter_release_checksum:
   arm64: sha256:eb5e7d16f18bb3272d0d832986fc8ac6cb0b6c42d487c94e15dabb10feae8e04
   amd64: sha256:8c1f6a317457a658e0ae68ad710f6b4098db2cad10204649b51e3c043aa3e70d
 
-adminapi_release: 0.16.2
+adminapi_release: 0.17.1
 adminapi_release_checksum:
-  arm64: sha256:94fc9d916ce7b54c20e4cb9e0898a2aed205436ee604663636f38a40183163f3
-  amd64: sha256:134be79a98416e8fcefe2bebf85c6fad56d23c0f99252c8566889c879b9651b5
+  arm64: sha256:72ee4c1c9026c9935ab19bc96f1c8e49529549299cc654cd91d54ae7177143b7
+  amd64: sha256:9392c3b2c12967efad9e90223d12eaaf788b56fa7c5d206ef30e434e5416ed7f
 
 # Postgres Extensions
 postgis_release: "3.1.4"
 
@@ -1,3 +1,3 @@
 {
-  "postgres-version": "14.1.0.15"
+  "postgres-version": "14.1.0.16-rc0"
 }
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "postgres-version": "14.1.0.15"`
	`2`	`+ "postgres-version": "14.1.0.16-rc0"`
`3`	`3`	`}`