diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-11-19 14:30:47 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-11-19 14:30:47 +0000 |
| commit | 67eac5c74bc51e5a351f75e06c436fd34ddb3307 (patch) | |
| tree | 1341a7f7ba5f5ffabd2cbe1149f0f10f42e83824 | |
| parent | 7ea35d594a3fdbc9f7dc498216dca8c60f4256b7 (diff) | |
| parent | e901f644ec3a4c10c2ac648696e8d9dba5a205f9 (diff) | |
Merge branch 'feature/set-rails-env-from-cap-config' into rails-3-develop
| -rw-r--r-- | config/deploy.rb | 1 | ||||
| -rw-r--r-- | config/deploy.yml.example | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/config/deploy.rb b/config/deploy.rb index d26a199c8..8ab67bc98 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -13,6 +13,7 @@ set :git_enable_submodules, true set :deploy_to, configuration['deploy_to'] set :user, configuration['user'] set :use_sudo, false +set :rails_env, configuration['rails_env'] server configuration['server'], :app, :web, :db, :primary => true diff --git a/config/deploy.yml.example b/config/deploy.yml.example index 61931e50e..a20eb3c22 100644 --- a/config/deploy.yml.example +++ b/config/deploy.yml.example @@ -4,10 +4,12 @@ production: branch: master server: www.example.com user: deploy + rails_env: production deploy_to: /srv/www/alaveteli_production staging: repository: git://github.com/mysociety/alaveteli.git branch: develop server: test.example.com user: deploy + rails_env: production deploy_to: /srv/www/alaveteli_staging |