diff --git a/Makefile b/Makefile index 9c79e9a..09b6423 100644 --- a/Makefile +++ b/Makefile @@ -20,12 +20,12 @@ content-push: content-pull: git subtree pull --prefix=user user-deploy main --squash -# Server -server-install: +# Remote +remote-install: ssh $(SERVER) "bash -s" < scripts/server-install.sh -server-install-plugins: +remote-install-plugins: ssh $(SERVER) "cd $(WEBROOT) && php bin/gpm install $(shell cat plugins.txt | tr '\n' ' ') -y" -server-upgrade-grav: +remote-upgrade-grav: ssh $(SERVER) "cd $(WEBROOT) && php bin/grav upgrade" diff --git a/README.md b/README.md index 9894a2a..38e5a99 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ The `user/` folder in this repo is linked to the user repo via git subtree. Production runs on a VPS with Apache. The user repo is cloned into the Grav `user/` folder on the server and kept in sync via the Git Sync plugin. -### Server config +### Remote config Copy `.env.example` to `.env` and fill in your values (gitignored): @@ -57,28 +57,28 @@ WEBROOT=/path/to/public_html USER_REPO=ssh://git@gitea.example.com/user/repo.git ``` -### First-time server install +### First-time install ``` -make server-install +make remote-install ``` This SSHes into the server and runs `scripts/server-install.sh`, which installs Grav and clones the user repo. -### Deploying changes +### Deploying content changes ``` make content-push # push local user/ changes to the user repo on Gitea make content-pull # pull editor's content changes back locally ``` -After `make deploy`, the Git Sync plugin on the server pulls the changes automatically via webhook. +After `make content-push`, the Git Sync plugin on the server pulls the changes automatically via webhook. -### Server maintenance +### Remote maintenance ``` -make server-install-plugins # install/update plugins from plugins.txt on server -make server-upgrade-grav # upgrade Grav core on server +make remote-install-plugins # install/update plugins from plugins.txt on server +make remote-upgrade-grav # upgrade Grav core on server ``` ## Plugins @@ -86,4 +86,4 @@ make server-upgrade-grav # upgrade Grav core on server Plugins are not committed to git. The full list is in `plugins.txt`. - Locally: `make install-plugins` -- On server: `make server-install-plugins` +- Remotely: `make remote-install-plugins`