ms_deploy 0.0.7 → 0.0.10

data/lib/examples/deploy.rb

@@ -73,8 +73,7 @@ set(:shared_directories_to_create) {
 
 set(:shared_directories_to_link) {
   {
-    "#{shared_path}/bundle/" => "#{release_path}/vendor/bundle",
-    "#{shared_path}/solr/" => "#{release_path}/solr"
+    "#{shared_path}/bundle/" => "#{release_path}/vendor/bundle"
   }
 }
 
@@ -87,15 +86,15 @@ set(:directories_to_create) {
 
 set(:files_to_link) {
   {
-    "#{shared_path}/config/config.production.yml" => "#{release_path}/config/config.local.yml",
-    "#{shared_path}/config/unicorn.production.rb" => "#{release_path}/config/unicorn.production.rb"
+    "#{shared_path}/config/config.#{stage}.yml" => "#{release_path}/config/config.local.yml",
+    "#{shared_path}/config/unicorn.#{stage}.rb" => "#{release_path}/config/unicorn.production.rb"
   }
 }
 
 set(:config_file_to_setup) {
   [
-    "config.production.yml",
-    "unicorn.production.rb"
+    "config.#{stage}.yml",
+    "unicorn.#{stage}.rb"
   ]
 }
 

data/lib/ms_deploy/recipes/deploy/assets.rb

@@ -8,6 +8,7 @@ Capistrano::Configuration.instance.load do
       end
 
       after 'deploy', 'deploy:assets:compile'
+      after 'deploy:migrations', 'deploy:assets:compile'
 
     end
   end

data/lib/ms_deploy/recipes/deploy/unicorn.rb

@@ -1,15 +1,15 @@
 Capistrano::Configuration.instance.load do
 
   set :unicorn_binary, "bundle exec unicorn"
-  set :unicorn_config, "#{current_path}/config/unicorn.production.rb"
-  set :unicorn_pid, "#{current_path}/tmp/pids/unicorn.pid"
+  set :unicorn_config, "config/unicorn.#{fetch(:stage, 'production')}.rb"
+  set :unicorn_pid, "tmp/pids/unicorn.pid"
 
   namespace :deploy do
     task :start, :roles => :app, :except => { :no_release => true } do
-      run "cd #{current_path} && #{try_sudo} #{unicorn_binary} -c #{unicorn_config} -E #{rails_env} -D"
+      run "cd #{current_path} && #{try_sudo} #{unicorn_binary} -c #{current_path}/#{unicorn_config} -E #{rails_env} -D"
     end
     task :stop, :roles => :app, :except => { :no_release => true } do
-      run "if [ -f #{unicorn_pid} ]; then #{try_sudo} kill `cat #{unicorn_pid}`; fi"
+      run "if [ -f #{current_path}/#{unicorn_pid} ]; then #{try_sudo} kill `cat #{current_path}/#{unicorn_pid}`; fi"
     end
     task :graceful_stop, :roles => :app, :except => { :no_release => true } do
       run "#{try_sudo} kill -s QUIT `cat #{unicorn_pid}`"

data/lib/ms_deploy/recipes/nginx.rb

@@ -30,16 +30,16 @@ Capistrano::Configuration.instance.load do
 
       task :install  do
         template_path = File.expand_path('../../templates/vhost.erb', __FILE__)
-        vars = {'application'=> application, 'project_root' => deploy_to + '/current', 'domain' => vhost_domain}
+        vars = {'application'=> application, 'project_root' => deploy_to + '/current', 'domain' => vhost_domain, 'stage' => stage, 'auth_basic_title' => fetch(:auth_basic_title, nil), 'auth_basic_password_file' => fetch(:auth_basic_password_file, nil)}
         config_path = "#{shared_path}/config/#{application}_vhost.conf"
 
         put(render_erb_template(template_path, vars), config_path)
-        sudo "rm -f /etc/nginx/sites-enabled/#{application}.conf"
-        sudo "ln -s #{config_path} /etc/nginx/sites-enabled/#{application}.conf"
+        sudo "rm -f /etc/nginx/sites-enabled/#{application}_#{stage}.conf"
+        sudo "ln -s #{config_path} /etc/nginx/sites-enabled/#{application}_#{stage}.conf"
       end
 
       task :uninstall  do
-        sudo "rm -f /etc/nginx/sites-enabled/#{application}.conf"
+        sudo "rm -f /etc/nginx/sites-enabled/#{application}_#{stage}.conf"
       end
     end
   end

data/lib/ms_deploy/templates/vhost.erb

@@ -1,11 +1,11 @@
 
-upstream <%= application %>_server {
+upstream <%= application %>_<%= stage %>_server {
   # fail_timeout=0 means we always retry an upstream even if it failed
   # to return a good HTTP response (in case the Unicorn master nukes a
   # single worker for timing out).
 
   # This is the socket we configured in unicorn.rb
-  server unix:/tmp/sockets/<%= application %>.sock fail_timeout=0;
+  server unix:/tmp/sockets/<%= application %>_<%= stage %>.sock fail_timeout=0;
 
   # for TCP setups, point these to your backend servers
   # server 127.0.0.1:8080 fail_timeout=0;
@@ -67,9 +67,14 @@ server {
     # proxy_buffering off;
 
     if (!-f $request_filename) {
-      proxy_pass http://<%= application %>_server;
+      proxy_pass http://<%= application %>_<%= stage %>_server;
       break;
     }
+
+    <% if auth_basic_title %>
+    auth_basic            "<%= auth_basic_title %>";
+    auth_basic_user_file  <%= auth_basic_password_file %>;
+    <% end %>
   }
 
   # Rails error pages

data/lib/ms_deploy/version.rb

@@ -1,3 +1,3 @@
 module MsDeploy
-  VERSION = "0.0.7"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ms_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-11 00:00:00.000000000 Z
+date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &72729820 !ruby/object:Gem::Requirement
+  requirement: &77667400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72729820
+  version_requirements: *77667400
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
-  requirement: &72729240 !ruby/object:Gem::Requirement
+  requirement: &77666540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72729240
+  version_requirements: *77666540
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &72728770 !ruby/object:Gem::Requirement
+  requirement: &77665970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72728770
+  version_requirements: *77665970
 description: capistrano deployment task for my projects
 email:
 - michael.schiller@gmx.de
@@ -68,7 +68,6 @@ files:
 - lib/ms_deploy/recipes/redis.rb
 - lib/ms_deploy/recipes/whenever.rb
 - lib/ms_deploy/render.rb
-- lib/ms_deploy/templates/ssl_vhost.erb
 - lib/ms_deploy/templates/vhost.erb
 - lib/ms_deploy/version.rb
 - ms_deploy.gemspec

data/lib/ms_deploy/templates/ssl_vhost.erb

@@ -1,85 +0,0 @@
-
-upstream <%= application %>_server {
-  # fail_timeout=0 means we always retry an upstream even if it failed
-  # to return a good HTTP response (in case the Unicorn master nukes a
-  # single worker for timing out).
-
-  # This is the socket we configured in unicorn.rb
-  server unix: <%= project_root %>/tmp/sockets/unicorn.sock fail_timeout=0;
-
-  # for TCP setups, point these to your backend servers
-  # server 127.0.0.1:8080 fail_timeout=0;
-  # server 192.168.0.8:8080 fail_timeout=0;
-  # server 192.168.0.9:8080 fail_timeout=0;
-}
-
-server {
-
-  listen 443;
-  server_name <%= domain %>;
-
-  ssl                  on;
-  ssl_certificate      /usr/local/nginx/conf/cert.pem;
-  ssl_certificate_key  /usr/local/nginx/conf/cert.key;
-
-  client_max_body_size 4G;
-
-  # ~2 seconds is often enough for most folks to parse HTML/CSS and
-  # retrieve needed images/icons/frames, connections are cheap in
-  # nginx so increasing this is generally safe...
-  #keepalive_timeout 5;
-
-  # path for static files
-  root <%= project_root %>/public;
-
-  # Prefer to serve static files directly from nginx to avoid unnecessary
-  # data copies from the application server.
-  #
-  # try_files directive appeared in in nginx 0.7.27 and has stabilized
-  # over time.  Older versions of nginx (e.g. 0.6.x) requires
-  # "if (!-f $request_filename)" which was less efficient:
-  # http://bogomips.org/unicorn.git/tree/examples/nginx.conf?id=v3.3.1#n127
-  try_files $uri/index.html $uri.html $uri @app;
-
-  location / {
-    # an HTTP header important enough to have its own Wikipedia entry:
-    #   http://en.wikipedia.org/wiki/X-Forwarded-For
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-    # enable this if and only if you use HTTPS, this helps Rack
-    # set the proper protocol for doing redirects:
-    # proxy_set_header X-Forwarded-Proto https;
-
-    # pass the Host: header from the client right along so redirects
-    # can be set properly within the Rack application
-    proxy_set_header Host $http_host;
-
-    # we don't want nginx trying to do something clever with
-    # redirects, we set the Host: header above already.
-    proxy_redirect off;
-
-    # set "proxy_buffering off" *only* for Rainbows! when doing
-    # Comet/long-poll/streaming.  It's also safe to set if you're using
-    # only serving fast clients with Unicorn + nginx, but not slow
-    # clients.  You normally want nginx to buffer responses to slow
-    # clients, even with Rails 3.1 streaming because otherwise a slow
-    # client can become a bottleneck of Unicorn.
-    #
-    # The Rack application may also set "X-Accel-Buffering (yes|no)"
-    # in the response headers do disable/enable buffering on a
-    # per-response basis.
-    # proxy_buffering off;
-
-    if (!-f $request_filename) {
-      proxy_pass http://app_server;
-      break;
-    }
-  }
-
-  # Rails error pages
-  error_page 500 502 503 504 /500.html;
-  location = /500.html {
-  root <%= project_root %>/public;
-  }
-}
-