Skip to content
Browse files

updating gemfile and config files

  • Loading branch information...
1 parent d707f77 commit 31a4ac72f1e584be920e48c6eb2e46791ae0301c @hcatlin committed Jun 3, 2010
Showing with 12 additions and 21 deletions.
  1. +3 −0 Gemfile
  2. +2 −0 config.ru
  3. +7 −21 config/deploy.rb
View
3 Gemfile
@@ -5,6 +5,7 @@ source :gemcutter
merb_gems_version = "1.1.0"
#disable_system_gems
+gem "bundler", "0.9.5"
gem "memcache-client", "1.7.5", :require => []
gem "curb", "0.5.4.0"
gem "nokogiri", "1.3.3"
@@ -14,6 +15,7 @@ gem "moneta", "0.6.0"
gem "json_pure"
gem "typhoeus"
gem "haml"
+gem "abstract"
#gem "do_mysql", :bundle => false
#gem "mysql", :bundle => false
@@ -26,3 +28,4 @@ gem "merb-mailer", merb_gems_version
gem "merb-exceptions", merb_gems_version
gem "rake"
+gem "rspec"
View
2 config.ru
@@ -8,6 +8,8 @@ rescue LoadError
require 'rubygems'
end
+require 'bundler'
+
require 'merb-core'
Merb::Config.setup(:merb_root => ::File.expand_path(::File.dirname(__FILE__)),
View
28 config/deploy.rb
@@ -7,35 +7,21 @@
set :deploy_to, "/srv/#{application}"
set :branch, "stable"
-role :web, "mobile1.wikimedia.org"#, "mobile2.wikimedia.org"
-role :cache, "mobile1.wikimedia.org"
+set :use_sudo, false
+
+role :web, "mobile1.wikimedia.org", "mobile2.wikimedia.org"
namespace :deploy do
-
+
task :gems do
#run "cd #{current_path} && bundle install"
end
-
+
task :after_update do
gems
end
-
+
task :restart do
- run "#{current_path}/bin/server --onebyone -C #{current_path}/config/thins/mobile.yml restart"
- end
-
- task :start do
- begin
- run "#{current_path}/bin/server -C #{current_path}/config/thins/mobile.yml start"
- rescue
- retry
- end
- end
-
- task :stop do
- begin
- run "#{current_path}/bin/server -C #{current_path}/config/thins/mobile.yml stop"
- rescue
- end
+ run "touch #{current_path}/tmp/restart.txt"
end
end

0 comments on commit 31a4ac7

Please sign in to comment.
Something went wrong with that request. Please try again.