summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-10-08 10:52:20 -0700
committerjessib <jessib@riseup.net>2012-10-08 10:52:20 -0700
commitf77301824c42bdd4559a0b0e58b8f3c26f239643 (patch)
treec815c1c82e4350e12e6ee38d00b979812fa840c2 /config
parentc4220a167f883f31c408b55cd970761faeb53aa5 (diff)
parente264e7354788c0b7eff7bb296eed9c59304cc8b8 (diff)
Merge remote branch 'origin/release-0.1.0' into help_develop
Diffstat (limited to 'config')
-rw-r--r--config/deploy.rb.example10
1 files changed, 6 insertions, 4 deletions
diff --git a/config/deploy.rb.example b/config/deploy.rb.example
index 552c820..9e54c22 100644
--- a/config/deploy.rb.example
+++ b/config/deploy.rb.example
@@ -1,10 +1,10 @@
require "bundler/capistrano"
set :application, "webapp"
-set :repository, "git://leap.se/leap_web_demo"
set :scm, :git
-# Or: `accurev`, `bzr`, `cvs`, `darcs`, `git`, `mercurial`, `perforce`, `subversion` or `none`
+set :repository, "git://leap.se/leap_web"
+set :branch, "master"
set :deploy_via, :remote_cache
set :deploy_to, '/home/webapp'
@@ -14,8 +14,10 @@ set :normalize_asset_timestamps, false
set :user, "webapp"
-role :web, "YOUR SERVER GOES HERE" # Your HTTP server, Apache/etc
-role :app, "YOUR SERVER GOES HERE" # This may be the same as your `Web` server
+role :web, "YOUR SERVER" # Your HTTP server, Apache/etc
+role :app, "YOUR SERVER" # This may be the same as your `Web` server
+
+# We're not using this for now...
# role :db, "your primary db-server here", :primary => true # This is where Rails migrations will run
# role :db, "your slave db-server here"