From 9729a4c11aa32d49b2e10ba8f865feb13ae30f5f Mon Sep 17 00:00:00 2001
From: Crispy1975 <12525875+Crispy1975@users.noreply.github.com>
Date: Sun, 18 May 2025 12:14:28 +0100
Subject: [PATCH 1/2] fix: update adminapi systemd unit file to wait for the
 network and pgbouncer

---
 ansible/files/adminapi.service.j2 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ansible/files/adminapi.service.j2 b/ansible/files/adminapi.service.j2
index 3b2821984..b911783f0 100644
--- a/ansible/files/adminapi.service.j2
+++ b/ansible/files/adminapi.service.j2
@@ -1,5 +1,12 @@
 [Unit]
 Description=AdminAPI
+Requires=network-online.target
+After=network-online.target pgbouncer.service
+Wants=pgbouncer.service
+
+# Move this to the Service section if on systemd >=250
+StartLimitIntervalSec=60
+StartLimitBurst=10
 
 [Service]
 Type=simple
@@ -7,10 +14,13 @@ ExecStart=/opt/supabase-admin-api
 User=adminapi
 Restart=always
 RestartSec=3
+TimeoutStopSec=10
 Environment="AWS_USE_DUALSTACK_ENDPOINT=true"
 {% if qemu_mode is defined and qemu_mode %}
 Environment="AWS_SDK_LOAD_CONFIG=true"
 {% endif %}
+StandardOutput=journal
+StandardError=journal
 
 [Install]
 WantedBy=multi-user.target

From 1c5767c4407b8b045ef25fc78fb1cff695b4048f Mon Sep 17 00:00:00 2001
From: Crispy1975 <12525875+Crispy1975@users.noreply.github.com>
Date: Sun, 18 May 2025 13:22:08 +0100
Subject: [PATCH 2/2] fix: remove the want pgboucner section as we might not
 want it to always start

---
 ansible/files/adminapi.service.j2 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ansible/files/adminapi.service.j2 b/ansible/files/adminapi.service.j2
index b911783f0..ed5a5b39b 100644
--- a/ansible/files/adminapi.service.j2
+++ b/ansible/files/adminapi.service.j2
@@ -2,7 +2,6 @@
 Description=AdminAPI
 Requires=network-online.target
 After=network-online.target pgbouncer.service
-Wants=pgbouncer.service
 
 # Move this to the Service section if on systemd >=250
 StartLimitIntervalSec=60