diff options
| author | Henare Degan <henare.degan@gmail.com> | 2012-09-11 09:12:02 +1000 |
|---|---|---|
| committer | Henare Degan <henare.degan@gmail.com> | 2012-09-11 09:12:02 +1000 |
| commit | ba7e23ff8fccf30e3c88bfc06949bfea23cb04e0 (patch) | |
| tree | 47c76e49557f9877f4647bb36ebfbdcd1562a996 | |
| parent | f9e99d78d0f45b206df37ae89d2a51433f1ca0e2 (diff) | |
Move deployment configuration into its own file - thanks @crowbot!
| -rw-r--r-- | config/.gitignore | 1 | ||||
| -rw-r--r-- | config/deploy.rb | 2 | ||||
| -rw-r--r-- | config/deploy.yml.example | 11 | ||||
| -rw-r--r-- | config/general.yml-example | 16 |
4 files changed, 13 insertions, 17 deletions
diff --git a/config/.gitignore b/config/.gitignore index c02384ed6..78d586ea8 100644 --- a/config/.gitignore +++ b/config/.gitignore @@ -6,3 +6,4 @@ rails_env.rb logrotate memcached.yml *.deployed +deploy.yml diff --git a/config/deploy.rb b/config/deploy.rb index 833252ea5..5340a54ef 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -3,7 +3,7 @@ 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/general.yml')['deployment'][stage] +configuration = YAML.load_file('config/general.yml')[stage] set :application, 'alaveteli' set :scm, :git diff --git a/config/deploy.yml.example b/config/deploy.yml.example new file mode 100644 index 000000000..10b6f36bc --- /dev/null +++ b/config/deploy.yml.example @@ -0,0 +1,11 @@ +# Site-specific deployment configuration lives in this file +production: + repository: git@github.com:mysociety/alaveteli.git + branch: master + server: www.example.com + path: /srv/www/alaveteli_production +staging: + repository: git@github.com:mysociety/alaveteli.git + branch: develop + server: test.example.com + path: /srv/www/alaveteli_staging diff --git a/config/general.yml-example b/config/general.yml-example index a1676ad75..a6f657d96 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -157,19 +157,3 @@ VARNISH_HOST: localhost # Adding a value here will enable Google Analytics on all non-admin pages. GA_CODE: '' - -## Capistrano Deployment -# -# This section contains site-specific config that allows you to deploy -# Alaveteli using Capistrano -deployment: - production: - repository: git@github.com:mysociety/alaveteli.git - branch: master - server: www.example.com - path: /srv/www/alaveteli_production - staging: - repository: git@github.com:mysociety/alaveteli.git - branch: develop - server: test.example.com - path: /srv/www/alaveteli_staging |