From 08289f57a4828c0c08588c8e8fe07aae23a0f5e5 Mon Sep 17 00:00:00 2001 From: Angelico Date: Thu, 26 Sep 2024 13:54:04 +0800 Subject: [PATCH 1/4] chore: init commence-backup service --- ansible/files/adminapi.sudoers.conf | 2 ++ ansible/files/commence-backup.service | 12 ++++++++++++ ansible/tasks/internal/admin-api.yml | 5 +++++ 3 files changed, 19 insertions(+) create mode 100644 ansible/files/commence-backup.service diff --git a/ansible/files/adminapi.sudoers.conf b/ansible/files/adminapi.sudoers.conf index eada0a94b..ae5537715 100644 --- 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 b/ansible/files/commence-backup.service new file mode 100644 index 000000000..9d4ad0c68 --- /dev/null +++ b/ansible/files/commence-backup.service @@ -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 index cea0109fd..da93fef62 100644 --- 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 From 04be2506386d7107050792213903baac85b9c190 Mon Sep 17 00:00:00 2001 From: Angelico Date: Tue, 1 Oct 2024 12:33:29 +0800 Subject: [PATCH 2/4] chore: bump adminapi and adminmgr --- ansible/vars.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/vars.yml b/ansible/vars.yml index e76e99cb0..ae0b2e09e 100644 --- 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" From e58cb346b8254ecccff8fcec88ef6351727d8ed9 Mon Sep 17 00:00:00 2001 From: Angelico Date: Tue, 1 Oct 2024 12:38:27 +0800 Subject: [PATCH 3/4] chore: bump version --- common-nix.vars.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-nix.vars.pkr.hcl b/common-nix.vars.pkr.hcl index 38508dbf0..898212036 100644 --- a/common-nix.vars.pkr.hcl +++ b/common-nix.vars.pkr.hcl @@ -1 +1 @@ -postgres-version = "15.8.1.001" +postgres-version = "15.8.1.002" From bd67d3196ffa8810be608fefae4692ff4efadc4d Mon Sep 17 00:00:00 2001 From: Angelico Date: Tue, 1 Oct 2024 15:55:23 +0800 Subject: [PATCH 4/4] fix: provide correct filename --- .../files/{commence-backup.service => commence-backup.service.j2} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ansible/files/{commence-backup.service => commence-backup.service.j2} (100%) diff --git a/ansible/files/commence-backup.service b/ansible/files/commence-backup.service.j2 similarity index 100% rename from ansible/files/commence-backup.service rename to ansible/files/commence-backup.service.j2