Redstoner/redstoner-utils
Archived
0
Fork 0
Code Issues 6 Pull Requests Wiki Activity

deploying details added to readme

Browse Source
This commit is contained in:
jomo
2014-07-20 17:05:15 +02:00
parent 3806af1f66
commit f48dcf11ef
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
README.md
View File

@@ -41,12 +41,24 @@ Detailed description:
**Never** edit the files directly on the server! **Never** edit the files directly on the server!
The dev server uses the *dev* branch, the live server uses *master*. The dev server uses the *dev* branch, the live server uses *master*.
**Do not use `git pull` on the server!** *(All files must be pulled/owned by the 'redstoner' user.)*
Please use the script `<server-dir>/git_pull_utils.sh`. ### Deploying on test server
**Do not use `git pull` on the server!** * Push all changes
All files must be owned and pulled by the *redstoner* user. * Run `<server-dir>/git_pull_utils.sh`.
* Restart (You can try reloading here, but expect the unexpected)
Be **very careful** with the live server! Make sure you're in the *master* branch and the code is working before pulling/restarting! ### Deploying on production server
* Test all code carefully on the test server
***on your machine:***
* `git checkout master`
* `git pull`
* `git merge dev`
* `git push -u origin master`
* `git checkout dev`
***on the server:***
* `rs update_utils`
* Restart
# Modules / Files # Modules / Files