Merge branch 'release/15.6' into pcnc/wrappers-15.6

supabase · Oct 2, 2024 · 989415b · 989415b
2 parents 23f5c7e + 8706e3a
commit 989415b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 3 deletions.
diff --git a/ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh b/ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh
@@ -11,6 +11,7 @@
 # them depending on regtypes referencing system OIDs or outdated library files.
 EXTENSIONS_TO_DISABLE=(
     "pg_graphql"
+    "pg_stat_monitor"
 )
 
 PG14_EXTENSIONS_TO_DISABLE=(

diff --git a/ansible/files/adminapi.sudoers.conf b/ansible/files/adminapi.sudoers.conf
@@ -17,6 +17,8 @@ Cmnd_Alias PGBOUNCER = /bin/systemctl start pgbouncer.service, /bin/systemctl st
 %adminapi ALL= NOPASSWD: /usr/bin/systemctl restart postgresql.service
 %adminapi ALL= NOPASSWD: /usr/bin/systemctl show -p NRestarts postgresql.service
 %adminapi ALL= NOPASSWD: /usr/bin/systemctl restart adminapi.service
+%adminapi ALL= NOPASSWD: /usr/bin/systemctl is-active commence-backup.service
+%adminapi ALL= NOPASSWD: /usr/bin/systemctl start commence-backup.service
 %adminapi ALL= NOPASSWD: /bin/systemctl daemon-reload
 %adminapi ALL= NOPASSWD: /bin/systemctl restart services.slice
 %adminapi ALL= NOPASSWD: /usr/sbin/nft -f /etc/nftables/supabase_managed.conf

diff --git a/ansible/files/commence-backup.service.j2 b/ansible/files/commence-backup.service.j2
@@ -0,0 +1,12 @@
+[Unit]
+Description=Async commence physical backup
+
+[Service]
+Type=simple
+User=adminapi
+ExecStart=/usr/bin/admin-mgr commence-backup --run-as-service true
+Restart=no
+OOMScoreAdjust=-1000
+
+[Install]
+WantedBy=multi-user.target
diff --git a/ansible/tasks/internal/admin-api.yml b/ansible/tasks/internal/admin-api.yml
@@ -79,6 +79,11 @@
     src: files/adminapi.service.j2
     dest: /etc/systemd/system/adminapi.service
 
+- name: adminapi - create service file for commence backup process
+  template:
+     src: files/commence-backup.service.j2
+     dest: /etc/systemd/system/commence-backup.service
+
 - name: UFW - Allow connections to adminapi ports
   ufw:
     rule: allow

diff --git a/ansible/vars.yml b/ansible/vars.yml
@@ -50,8 +50,8 @@ postgres_exporter_release_checksum:
   arm64: sha256:29ba62d538b92d39952afe12ee2e1f4401250d678ff4b354ff2752f4321c87a0
   amd64: sha256:cb89fc5bf4485fb554e0d640d9684fae143a4b2d5fa443009bd29c59f9129e84
 
-adminapi_release: 0.68.0
-adminmgr_release: 0.22.1
+adminapi_release: 0.71.1
+adminmgr_release: 0.24.0
 
 # Postgres Extensions
 postgis_release: "3.3.2"

diff --git a/common-nix.vars.pkr.hcl b/common-nix.vars.pkr.hcl
@@ -1 +1 @@
-postgres-version = "15.6.1.125"
+postgres-version = "15.6.1.126"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		postgres-version = "15.6.1.125"
		postgres-version = "15.6.1.126"