aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/deploy.rb1
-rw-r--r--doc/DEPLOY.md4
2 files changed, 2 insertions, 3 deletions
diff --git a/config/deploy.rb b/config/deploy.rb
index 886cc64fe..ea395c37c 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,6 +1,5 @@
require 'bundler/capistrano'
-# Deploy to staging by default unless you specify '-S stage=production' on the command line
set :stage, 'staging' unless exists? :stage
configuration = YAML.load_file('config/deploy.yml')[stage]
diff --git a/doc/DEPLOY.md b/doc/DEPLOY.md
index 269b2c25d..aaf0c777a 100644
--- a/doc/DEPLOY.md
+++ b/doc/DEPLOY.md
@@ -36,5 +36,5 @@ For additional usage instructions, see the [Capistrano wiki](https://github.com/
### TODO
-* Allow `cap deploy:setup` to install dependencies like those in `config/packages`
-* Use [Whenever](https://github.com/javan/whenever) to set up cronjobs \ No newline at end of file
+* Get `cap deploy:setup` to do most of the work described above in the *Set up* section
+* Use [Whenever](https://github.com/javan/whenever) to set up cronjobs