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
<server-dir>/git_pull_utils.sh.
- Restart (You may try to
/reload here, but expect the unexpected)
Deploying on production server
- Test all code carefully on the test server
- on your machine:
git pull --all && git checkout master && git merge dev- when you get no errors:
git push
- make sure you go back to dev:
git checkout dev
- on the server:
rs update_utils- now restart to apply changes:
rs restart (don't reload!)