Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Changed `branch` setting to `ref`

  • Loading branch information...
commit f6811696b72b7b366ea98488449bbfc7489ed376 1 parent e7f8b0b
TJ Holowaychuk authored
Showing with 10 additions and 7 deletions.
  1. +8 −4 Readme.md
  2. +2 −3 bin/deploy
12 Readme.md
View
@@ -44,7 +44,7 @@
host n.n.n.n
repo git@github.com:visionmedia/express.git
path /var/www/myapp.com
- branch origin/master
+ ref origin/master
post-deploy /var/www/myapp.com/update.sh
## Directives
@@ -79,11 +79,15 @@
path /var/www/myapp.com
-### branch
+### ref
- GIT branch.
+ When specified, __HEAD__ is reset to `ref`. When deploying
+ production typically this will _not_ be used, as `deploy(1)` will
+ utilize the most recent tag by default, however this is useful
+ for a staging environment, as shown below where __HEAD__ is updated
+ and set to the develop branch.
- branch origin/master
+ ref origin/develop
### Hooks
5 bin/deploy
View
@@ -152,7 +152,6 @@ hook() {
setup() {
local path=`config_get path`
local repo=`config_get repo`
- local branch=`config_get branch`
run "mkdir -p $path/{shared/{logs,pids},source}"
test $? -eq 0 || abort 'setup paths failed'
log running setup
@@ -213,7 +212,7 @@ deploy() {
fi
# done
- log deploy complete
+ log "successfully deployed $ref"
}
#
@@ -323,4 +322,4 @@ done
require_env
# deploy
-deploy ${REF:-`config_get branch`}
+deploy ${REF:-`config_get ref`}
Please sign in to comment.
Something went wrong with that request. Please try again.