diff --git a/.env.example b/.env.example index b221b68..f43a8a8 100644 --- a/.env.example +++ b/.env.example @@ -9,7 +9,7 @@ WEBROOT=/home/example.com/public_html SITE_CONFIG_DIR=/home/example.com/site-config # Grav -GRAV_VERSION=1.7.53 +GRAV_VERSION=2.0.0-rc.10 # Repos USER_REPO=https://gitea.example.com/org/intotheeast-user.git diff --git a/docs/working/production-todo.md b/docs/working/production-todo.md index 7bca25b..4bad2c7 100644 --- a/docs/working/production-todo.md +++ b/docs/working/production-todo.md @@ -32,9 +32,8 @@ These are changes made in the local dev environment and committed before anythin ### 2.1 Configure .env -- [ ] Set `GRAV_VERSION=2.0.0-rc.9` in `.env` -- [ ] Set `GRAV_CHANNEL_SUFFIX=?testing` (makes the download URL resolve to the RC) -- [ ] Set `REMOTE_HOST`, `REMOTE_USER`, `REMOTE_PORT`, `REMOTE_HOME` for the production server +- [x] Set `GRAV_VERSION=2.0.0-rc.10` in `.env` (GitHub releases URL, no channel suffix needed) +- [x] Set `REMOTE_HOST`, `REMOTE_USER`, `REMOTE_PORT`, `REMOTE_HOME` for the production server - [ ] Set `USER_REPO` and `MAIN_REPO` (Gitea URLs) - [ ] Set `GITEA_HOST`, `GITEA_USER`, `GITEA_TOKEN` for the install-time clone diff --git a/scripts/server-install.sh b/scripts/server-install.sh index 084b2f6..51646f8 100755 --- a/scripts/server-install.sh +++ b/scripts/server-install.sh @@ -22,7 +22,7 @@ chmod 600 ~/.netrc echo "==> Downloading Grav $GRAV_VERSION" cd "$WEBROOT" -wget --no-verbose "https://getgrav.org/download/core/grav-admin/${GRAV_VERSION}${GRAV_CHANNEL_SUFFIX:-}" -O grav-admin.zip +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