diff options
author | Louise Crow <louise.crow@gmail.com> | 2012-10-17 14:04:58 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2012-10-17 14:04:58 +0100 |
commit | a4927fc05a710cee6217d8a40ce925d5f894fd8f (patch) | |
tree | 83909e1d903afbf49d50182af79a679442632975 /config/deploy.rb | |
parent | cc27fe66a13fe1504711c64ce5530a1c178e907d (diff) | |
parent | cc7bc36d5748c9baa0cfd8e44395923cc5792f32 (diff) |
Merge branch 'release/0.6.7' into wdtk
Conflicts:
config/general.yml-example
Diffstat (limited to 'config/deploy.rb')
-rw-r--r-- | config/deploy.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/deploy.rb b/config/deploy.rb index 888710f83..5e1c3aa0d 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -48,6 +48,10 @@ 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", "#{release_path}/files" => "#{shared_path}/files", "#{release_path}/cache" => "#{shared_path}/cache", "#{release_path}/vendor/plugins/acts_as_xapian/xapiandbs" => "#{shared_path}/xapiandbs", |