ms_deploy 0.1.3 → 0.1.4

data/lib/ms_deploy/recipes/nginx.rb

@@ -31,7 +31,7 @@ Capistrano::Configuration.instance.load do
       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), 'protocol' => 'http', 'nginx_cert_dir' => fetch(:nginx_cert_dir, '/etc/nginx/cert'), 'with_upstream_server' => true}
+        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, 'with_file_expire_max' => fetch(:with_file_expire_max, true), 'optional_http_content' => fetch(:optional_nginx_server_http_content, ''), 'optional_https_content' => fetch(:optional_nginx_server_https_content, '')}
 
         if protocol.nil? or protocol == 'http' or protocol == 'both'
           config_path = "#{shared_path}/config/#{application}_vhost.conf"

data/lib/ms_deploy/templates/vhost.erb

@@ -52,10 +52,15 @@ server {
   #  }
   #}
 
+<% if with_file_expire_max %>
   location ~* \.(ico|css|js|gif|jpe?g|png)(\?[0-9]+)?$ {
     expires max;
     break;
   }
+<% end %>
+
+  <%= optional_http_content if protocol == 'http' %>
+  <%= optional_https_content if protocol == 'https' %>
 
   # Prefer to serve static files directly from nginx to avoid unnecessary
   # data copies from the application server.

data/lib/ms_deploy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ms_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemcutter
-  requirement: &84131860 !ruby/object:Gem::Requirement
+  requirement: &89812210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84131860
+  version_requirements: *89812210
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &84131690 !ruby/object:Gem::Requirement
+  requirement: &89811760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *84131690
+  version_requirements: *89811760
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
-  requirement: &84131320 !ruby/object:Gem::Requirement
+  requirement: &89811510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *84131320
+  version_requirements: *89811510
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
-  requirement: &84130820 !ruby/object:Gem::Requirement
+  requirement: &89811270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *84130820
+  version_requirements: *89811270
 - !ruby/object:Gem::Dependency
   name: capistrano-unicorn
-  requirement: &84130590 !ruby/object:Gem::Requirement
+  requirement: &89811020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *84130590
+  version_requirements: *89811020
 - !ruby/object:Gem::Dependency
   name: capistrano-file_db
-  requirement: &84130300 !ruby/object:Gem::Requirement
+  requirement: &89810790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *84130300
+  version_requirements: *89810790
 - !ruby/object:Gem::Dependency
   name: capistrano-uptodate
-  requirement: &84130000 !ruby/object:Gem::Requirement
+  requirement: &89810560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *84130000
+  version_requirements: *89810560
 - !ruby/object:Gem::Dependency
   name: rvm-capistrano
-  requirement: &84129720 !ruby/object:Gem::Requirement
+  requirement: &89810330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *84129720
+  version_requirements: *89810330
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &84129480 !ruby/object:Gem::Requirement
+  requirement: &89810130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84129480
+  version_requirements: *89810130
 description: capistrano deployment task for my projects
 email:
 - michael.schiller@gmx.de