diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-09 11:32:37 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-09 11:32:37 +0100 |
| commit | 3c69d999dfdc09d8ad94c4d8e36c61b4fc0dd127 (patch) | |
| tree | 64c2e5d08b096e11a8b10de11c9914b428cf8f13 | |
| parent | 28ae5eb5595b41e06da5d74a6670b806364ef23a (diff) | |
| parent | 084f62b27304c2a06a844cd5a38b467b65dbab12 (diff) | |
Merge remote-tracking branch 'henare_github/add-memcached-to-capistrano' into develop
| -rw-r--r-- | config/deploy.rb | 1 | ||||
| -rw-r--r-- | doc/DEPLOY.md | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/deploy.rb b/config/deploy.rb index f82379df0..5e1c3aa0d 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -48,6 +48,7 @@ namespace :deploy do links = { "#{release_path}/config/database.yml" => "#{shared_path}/database.yml", "#{release_path}/config/general.yml" => "#{shared_path}/general.yml", + "#{release_path}/config/memcached.yml" => "#{shared_path}/memcached.yml", "#{release_path}/config/rails_env.rb" => "#{shared_path}/rails_env.rb", "#{release_path}/public/foi-live-creation.png" => "#{shared_path}/foi-live-creation.png", "#{release_path}/public/foi-user-use.png" => "#{shared_path}/foi-user-use.png", diff --git a/doc/DEPLOY.md b/doc/DEPLOY.md index adeb0e113..767f720fd 100644 --- a/doc/DEPLOY.md +++ b/doc/DEPLOY.md @@ -19,7 +19,8 @@ These are the general steps required to get your staging server up and running: * Run `cap deploy:update_code` so that we've got a copy of the example config on the server. This process will take a long time installing gems, etc. it will also fail on `rake:themes:install` but that's OK * SSH to the server, change to the `deploy_to` directory * `cp releases/[SOME_DATE]/config/general.yml-example shared/general.yml` -* `cp releases/[SOME_DATE]/config/general.yml-example shared/general.yml` +* `cp releases/[SOME_DATE]/config/database.yml-example shared/database.yml` +* `cp releases/[SOME_DATE]/config/memcached.yml-example shared/memcached.yml` * Edit those files to match your required settings * Back on your machine run `cap deploy` and it should successfully deploy * Run the DB migrations `cap deploy:migrate` |