From e4e4de319d38f88021411ce033630f8f20b3ac01 Mon Sep 17 00:00:00 2001
From: Mischa <mischa@gorinskat.nl>
Date: Sun, 21 Jun 2026 16:11:40 +0200
Subject: [PATCH] fix: include api plugin in server install alongside admin2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Both api and admin2 are bundled with the Grav 2.0 zip and not available
via GPM. Extract and install both during remote-install. Remove the
ad-hoc remote-install-admin2 target — the main install now covers it.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Vgmzx8VTTTmCskSpQtsLTr
---
 Makefile                  | 1 +
 scripts/server-install.sh | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index c2960f1..b218ec1 100644
--- a/Makefile
+++ b/Makefile
@@ -110,6 +110,7 @@ remote-fetch:
 remote-install-plugins:
 	$(SSH) "cd $(WEBROOT) && php bin/gpm install $(shell cat plugins.txt | tr '\n' ' ') -y"
 
+
 remote-upgrade-grav:
 	$(SSH) "cd $(WEBROOT) && php bin/grav upgrade"
 
diff --git a/scripts/server-install.sh b/scripts/server-install.sh
index 51646f8..a37a513 100755
--- a/scripts/server-install.sh
+++ b/scripts/server-install.sh
@@ -11,9 +11,6 @@ set -e
 : "${GITEA_USER:?GITEA_USER is not set}"
 : "${GITEA_TOKEN:?GITEA_TOKEN is not set}"
 
-# GRAV_CHANNEL_SUFFIX: optional, set to '?testing' for RC/beta releases (e.g. 2.0.0-rc.9)
-# Leave unset or empty for stable releases.
-
 trap 'rm -f ~/.netrc' EXIT
 
 echo "==> Setting up credentials (temporary)"
@@ -26,6 +23,7 @@ wget --no-verbose "https://github.com/getgrav/grav/releases/download/${GRAV_VERS
 unzip -oq grav-admin.zip
 cp -rf grav-admin/. .
 cp -rf grav-admin/user/plugins/admin2 /tmp/admin2-plugin
+cp -rf grav-admin/user/plugins/api /tmp/api-plugin
 rm -rf grav-admin grav-admin.zip
 
 echo "==> Cloning user repo"
@@ -43,7 +41,8 @@ fi
 echo "==> Creating required directories"
 mkdir -p user/plugins user/accounts user/data
 cp -rf /tmp/admin2-plugin user/plugins/admin2
-rm -rf /tmp/admin2-plugin
+cp -rf /tmp/api-plugin user/plugins/api
+rm -rf /tmp/admin2-plugin /tmp/api-plugin
 
 echo "==> Installing plugins"
 php bin/gpm install $PLUGINS -y