ms_deploy 0.1.2 → 0.1.3

data/lib/examples/deploy.rb

@@ -4,6 +4,9 @@ set :domain, ''
 set :deploy_domain, ''
 set :vhost_domain, ''
 
+# set application folder
+set :deploy_to, "/var/projects/#{application}/xxx"
+
 set :rails_root, File.expand_path('../../', __FILE__)
 set :rails_env, :production # use 'stage' to differ between stage environments
 

data/lib/ms_deploy/recipes/defaults.rb

@@ -4,6 +4,7 @@ Capistrano::Configuration.instance.load do
   abort "You must set :user before using defaults" unless fetch(:user, nil)
   abort "You must set :repository before using defaults" unless fetch(:repository, nil)
   abort "You must set :branch before using defaults" unless fetch(:branch, nil)
+  abort "You must set :deploy_to before using defaults" unless fetch(:deploy_to, nil)
 
   set :uptodate_scm, :git
   set :uptodate_branch, fetch(:branch)
@@ -33,6 +34,8 @@ Capistrano::Configuration.instance.load do
 
   set :group, user
 
+  set :protocol, :both
+
   set :scm, :git
   set :git_enable_submodules, true
 

data/lib/ms_deploy/recipes/nginx.rb

@@ -1,4 +1,4 @@
-require "ms_deploy/render"
+require "ms_deploy/render"         
 
 Capistrano::Configuration.instance.load do
 
@@ -29,17 +29,36 @@ Capistrano::Configuration.instance.load do
       end
 
       task :install  do
+        protocol = fetch(:protocol, nil).to_s
         template_path = File.expand_path('../../templates/vhost.erb', __FILE__)
-        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"
+        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), 'protocol' => 'http', 'nginx_cert_dir' => fetch(:nginx_cert_dir, '/etc/nginx/cert'), 'with_upstream_server' => true}
 
-        put(render_erb_template(template_path, vars), config_path)
-        sudo "rm -f /etc/nginx/sites-enabled/#{application}_#{stage}.conf"
-        sudo "ln -s #{config_path} /etc/nginx/sites-enabled/#{application}_#{stage}.conf"
+        if protocol.nil? or protocol == 'http' or protocol == 'both'
+          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}_#{stage}.conf"
+          sudo "ln -s #{config_path} /etc/nginx/sites-enabled/#{application}_#{stage}.conf"
+        end
+        if protocol == 'https' or protocol == 'both'
+          vars.merge!({'protocol' => 'https', 'with_upstream_server' => false})
+
+          config_path = "#{shared_path}/config/#{application}_ssl_vhost.conf"
+
+          put(render_erb_template(template_path, vars), config_path)
+          sudo "rm -f /etc/nginx/sites-enabled/#{application}_#{stage}_ssl.conf"
+          sudo "ln -s #{config_path} /etc/nginx/sites-enabled/#{application}_#{stage}_ssl.conf"
+        end
       end
 
       task :uninstall  do
-        sudo "rm -f /etc/nginx/sites-enabled/#{application}_#{stage}.conf"
+        protocol = fetch(:protocol, nil)
+
+        if protocol.blank? or protocol == 'http' or protocol == 'both'
+          sudo "rm -f /etc/nginx/sites-enabled/#{application}_#{stage}.conf"
+        elsif protocol == 'https' or protocol == 'both'
+          sudo "rm -f /etc/nginx/sites-enabled/#{application}_#{stage}_ssl.conf"
+        end
       end
     end
   end

data/lib/ms_deploy/templates/vhost.erb

@@ -1,4 +1,6 @@
 
+<% if with_upstream_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
@@ -12,19 +14,34 @@ upstream <%= application %>_<%= stage %>_server {
   # server 192.168.0.8:8080 fail_timeout=0;
   # server 192.168.0.9:8080 fail_timeout=0;
 }
+<% end %>
 
 server {
 
-  listen 80;
   server_name <%= domain %>;
 
-  client_max_body_size 4G;
+<% if protocol == 'https' %>
+
+  listen 443 default_server ssl;
+
+  ssl_certificate      <%= nginx_cert_dir %>/<%= application %>_cert.pem;
+  ssl_certificate_key  <%= nginx_cert_dir %>/<%= application %>_cert.key;
+
+  keepalive_timeout    70;
+
+<% else %>
+
+  listen 80;
 
   # ~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;
 
+<% end %>
+
+  client_max_body_size 4G;
+
   # path for static files
   root <%= project_root %>/public;
 

data/lib/ms_deploy/version.rb

@@ -1,3 +1,3 @@
 module MsDeploy
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ms_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemcutter
-  requirement: &88855100 !ruby/object:Gem::Requirement
+  requirement: &84131860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *88855100
+  version_requirements: *84131860
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &88854820 !ruby/object:Gem::Requirement
+  requirement: &84131690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *88854820
+  version_requirements: *84131690
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
-  requirement: &88854570 !ruby/object:Gem::Requirement
+  requirement: &84131320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *88854570
+  version_requirements: *84131320
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
-  requirement: &88854320 !ruby/object:Gem::Requirement
+  requirement: &84130820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *88854320
+  version_requirements: *84130820
 - !ruby/object:Gem::Dependency
   name: capistrano-unicorn
-  requirement: &88854090 !ruby/object:Gem::Requirement
+  requirement: &84130590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *88854090
+  version_requirements: *84130590
 - !ruby/object:Gem::Dependency
   name: capistrano-file_db
-  requirement: &88853850 !ruby/object:Gem::Requirement
+  requirement: &84130300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *88853850
+  version_requirements: *84130300
 - !ruby/object:Gem::Dependency
   name: capistrano-uptodate
-  requirement: &88853620 !ruby/object:Gem::Requirement
+  requirement: &84130000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *88853620
+  version_requirements: *84130000
 - !ruby/object:Gem::Dependency
   name: rvm-capistrano
-  requirement: &88853380 !ruby/object:Gem::Requirement
+  requirement: &84129720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *88853380
+  version_requirements: *84129720
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &88853170 !ruby/object:Gem::Requirement
+  requirement: &84129480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *88853170
+  version_requirements: *84129480
 description: capistrano deployment task for my projects
 email:
 - michael.schiller@gmx.de