aboutsummaryrefslogtreecommitdiffstats
path: root/config/deploy.rb
diff options
context:
space:
mode:
authorHenare Degan <henare.degan@gmail.com>2013-02-15 17:40:04 +1100
committerHenare Degan <henare.degan@gmail.com>2013-02-15 17:59:06 +1100
commita0f250204a376ce97a187cf8a9b2cb0b8c628298 (patch)
tree812504a7b8da2431b3fed6f38f6796cdbbc84e00 /config/deploy.rb
parent8f1caab7990dc417e32b14cbb5f00c34a0ddc10c (diff)
parentd16f2f8242352a2d3c0350275110453dd6ac6b12 (diff)
Merge branch 'develop' into rails-3-spike
Conflicts: Gemfile Gemfile.lock app/controllers/general_controller.rb app/controllers/track_controller.rb app/models/outgoing_message.rb app/models/public_body.rb app/models/user.rb app/views/general/frontpage.rhtml config/environment.rb config/initializers/inflections.rb config/initializers/mime_types.rb db/migrate/094_remove_old_tags_foreign_key.rb lib/timezone_fixes.rb spec/models/request_mailer_spec.rb spec/views/request/list.rhtml_spec.rb
Diffstat (limited to 'config/deploy.rb')
-rw-r--r--config/deploy.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/config/deploy.rb b/config/deploy.rb
index 004c3df35..5e660434a 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -19,7 +19,7 @@ server configuration['server'], :app, :web, :db, :primary => true
namespace :rake do
namespace :themes do
task :install do
- run "cd #{release_path} && bundle exec rake themes:install RAILS_ENV=#{rails_env}"
+ run "cd #{latest_release} && bundle exec rake themes:install RAILS_ENV=#{rails_env}"
end
end
end
@@ -48,7 +48,6 @@ 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}/config/newrelic.yml" => "#{shared_path}/newrelic.yml",
"#{release_path}/config/aliases" => "#{shared_path}/aliases",