Merge branch 'main' into feat/journal-post-form

# Conflicts:
#	scripts/test-form-config.sh
#	scripts/test-post.sh

scripts/git-sync-toggle.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+
+FILE="$1"
+STATE="$2"
+: "${FILE:?usage: git-sync-toggle.sh <git-sync.yaml path> <true|false>}"
+: "${STATE:?usage: git-sync-toggle.sh <git-sync.yaml path> <true|false>}"
+
+if [ ! -f "$FILE" ]; then
+    echo "ERROR: $FILE not found — is git-sync installed on this server?" >&2
+    exit 1
+fi
+
+if grep -qE '^enabled:' "$FILE"; then
+    sed -i -E "s/^enabled:.*/enabled: ${STATE}/" "$FILE"
+else
+    printf 'enabled: %s\n' "$STATE" | cat - "$FILE" > "$FILE.tmp" && mv "$FILE.tmp" "$FILE"
+fi
+
+echo "git-sync now: $(grep -E '^enabled:' "$FILE")"

scripts/server-install.sh

@@ -22,8 +22,6 @@ cd "$WEBROOT"
 wget --no-verbose "https://github.com/getgrav/grav/releases/download/${GRAV_VERSION}/grav-admin-v${GRAV_VERSION}.zip" -O grav-admin.zip
 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"
@@ -40,9 +38,6 @@ fi
 
 echo "==> Creating required directories"
 mkdir -p user/plugins user/accounts user/data
-cp -rf /tmp/admin2-plugin user/plugins/admin2
-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

scripts/test-post.sh

@@ -53,7 +53,10 @@ LOGIN_NONCE=$(echo "$LOGIN_HTML" | grep -o 'name="login-form-nonce" value="[^"]*
 LOGIN_STATUS=$(curl -sf -o /dev/null -w "%{http_code}" \
     -c "$COOKIE_JAR" -b "$COOKIE_JAR" \
     -L \
-    -d "username=${USER}&password=${PASS}&login-form-nonce=${LOGIN_NONCE}&task=login.login" \
+    --data-urlencode "username=${USER}" \
+    --data-urlencode "password=${PASS}" \
+    --data-urlencode "login-form-nonce=${LOGIN_NONCE}" \
+    --data-urlencode "task=login.login" \
     "$BASE_URL/login")
 
 # After login, fetch /post and verify we see the post form (not the login form)