fix: include api plugin in server install alongside admin2
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
This commit is contained in:
@@ -110,6 +110,7 @@ remote-fetch:
|
|||||||
remote-install-plugins:
|
remote-install-plugins:
|
||||||
$(SSH) "cd $(WEBROOT) && php bin/gpm install $(shell cat plugins.txt | tr '\n' ' ') -y"
|
$(SSH) "cd $(WEBROOT) && php bin/gpm install $(shell cat plugins.txt | tr '\n' ' ') -y"
|
||||||
|
|
||||||
|
|
||||||
remote-upgrade-grav:
|
remote-upgrade-grav:
|
||||||
$(SSH) "cd $(WEBROOT) && php bin/grav upgrade"
|
$(SSH) "cd $(WEBROOT) && php bin/grav upgrade"
|
||||||
|
|
||||||
|
|||||||
@@ -11,9 +11,6 @@ set -e
|
|||||||
: "${GITEA_USER:?GITEA_USER is not set}"
|
: "${GITEA_USER:?GITEA_USER is not set}"
|
||||||
: "${GITEA_TOKEN:?GITEA_TOKEN 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
|
trap 'rm -f ~/.netrc' EXIT
|
||||||
|
|
||||||
echo "==> Setting up credentials (temporary)"
|
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
|
unzip -oq grav-admin.zip
|
||||||
cp -rf grav-admin/. .
|
cp -rf grav-admin/. .
|
||||||
cp -rf grav-admin/user/plugins/admin2 /tmp/admin2-plugin
|
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
|
rm -rf grav-admin grav-admin.zip
|
||||||
|
|
||||||
echo "==> Cloning user repo"
|
echo "==> Cloning user repo"
|
||||||
@@ -43,7 +41,8 @@ fi
|
|||||||
echo "==> Creating required directories"
|
echo "==> Creating required directories"
|
||||||
mkdir -p user/plugins user/accounts user/data
|
mkdir -p user/plugins user/accounts user/data
|
||||||
cp -rf /tmp/admin2-plugin user/plugins/admin2
|
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"
|
echo "==> Installing plugins"
|
||||||
php bin/gpm install $PLUGINS -y
|
php bin/gpm install $PLUGINS -y
|
||||||
|
|||||||
Reference in New Issue
Block a user