diff --git a/Deploying-on-our-server.md b/Deploying-on-our-server.md new file mode 100644 index 0000000..c3721bd --- /dev/null +++ b/Deploying-on-our-server.md @@ -0,0 +1,21 @@ +**Never** edit the files directly on the server! + +----- + +The test server uses the *dev* branch, the production server uses *master*. +**Do not `git pull` on the server!** We have automated scripts for that. + +### Deploying on test server +* Push all changes +* Run `/git_pull_utils.sh`. +* Restart (You may try to `/reload` here, but expect the unexpected) + +### Deploying on production server +0. Test all code carefully on the test server +0. on your machine: + * pull + * merge *dev* into *master* + * push +0. on the server: + * `rs update_utils` + * Restart (**don't** `/reload`!) \ No newline at end of file