capistrano3-nginx 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48fb1cfbc6bc761fe0356000a5da22aa68c54725
-  data.tar.gz: c6c87bdc8e50ba85da819389f96f5ee48c1ce893
+  metadata.gz: 39d6a15b4f7b0023807b6c9924d0ecc3a74ea28d
+  data.tar.gz: ab02b0e917aa042a113888dddb947a55d6ce9ce0
 SHA512:
-  metadata.gz: caa8d743d80fcad64805f16c7b68bcdeeafdd733e38293e2ddf48b63d842708169db879c6f2c407fc99f6622de3f1a888ad8ea7d6ba02ea04386bb88960bef32
-  data.tar.gz: 9b4333a7e1b18ee1cc33dabdb9e0eee32b028c7cab79214c60aded9e378ed2415c9aec25944b9d700a5eee04bf0e0e08401452a4915ae16cffee5093a1b4bf02
+  metadata.gz: 48b67e2caa72c0a94bc13b80cfa474bd7b05e7681927d56f7372cb69863342b264e538f402efa45541d6119aad5ebbd75065fa24c7e05bcd8b7d147a15f0b7ac
+  data.tar.gz: 933f964e789260dc1b1e9ac47c4e3d070d2746bcd2e7e803adae1765463401fc930dc1c81b19352d68522f73c6cb44aa78478bd01b8c564e53cb53de41d8f834

data/README.md

@@ -6,7 +6,7 @@ Nginx support for Capistrano 3.x
 
 Add this line to your application's Gemfile:
 
-    gem 'capistrano3-nginx', '~> 1.0'
+    gem 'capistrano3-nginx', '~> 2.0'
     gem 'capistrano'
 
 And then execute:
@@ -57,6 +57,10 @@ set :nginx_log_path, "#{shared_path}/log"
 # default value: "/etc/nginx"
 set :nginx_root_path, "/etc/nginx"
 
+# Path where to look for static files
+# default value: "public"
+set :nginx_root_path, "my_static_folder"
+
 # Path where nginx available site are stored
 # default value: "sites-available"
 set :nginx_sites_available, "sites-available"
@@ -66,8 +70,10 @@ set :nginx_sites_available, "sites-available"
 set :nginx_sites_enabled, "sites-enabled"
 
 # Path to look for custom config template
-# default value: "config/deploy/#{stage}/nginx.conf.erb"
-set :nginx_template, "config/deploy/#{stage}/nginx.conf.erb"
+# `:default` will use the bundled nginx template
+# default value: :default
+set :nginx_template, "#{fetch(:stage_config_path)}/#{stage}/nginx.conf.erb"
+set :nginx_tempalte, :default
 
 # Use ssl on port 443 to serve on https. Every request to por 80
 # will be rewritten to 443

data/capistrano3-nginx.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano3-nginx'
-  spec.version       = '2.0.0'
+  spec.version       = '2.0.1'
   spec.authors       = ['Juan Ignacio Donoso']
   spec.email         = ['jidonoso@gmail.com']
   spec.description   = %q{Adds suuport to nginx for Capistrano 3.x}

data/lib/capistrano/tasks/nginx.rake

@@ -3,6 +3,7 @@ namespace :load do
     set :nginx_roles, -> { :web }
     set :nginx_log_path, -> { "#{shared_path}/log" }
     set :nginx_root_path, -> { "/etc/nginx" }
+    set :nginx_static_dir, -> { "public" }
     set :nginx_sites_enabled, -> { "sites-enabled" }
     set :nginx_sites_available, -> { "sites-available" }
     set :nginx_template, -> { :default }

data/templates/nginx.conf.erb

@@ -30,16 +30,16 @@ server {
 <% end %>
 
   server_name <%= fetch(:nginx_domains) %>;
-  root        <%= fetch(:deploy_to) %>/current/<%= fetch(:static_dir) %>;
+  root        <%= fetch(:deploy_to) %>/current/<%= fetch(:nginx_static_dir) %>;
 
   access_log <%= fetch(:nginx_log_path) %>/nginx-access.log;
   error_log  <%= fetch(:nginx_log_path) %>/nginx-error.log;
 
   error_page 404 /404.html;
-  location /404.html { root <%= fetch(:deploy_to) %>/current/<%= fetch(:static_dir) %>; }
+  location /404.html { root <%= fetch(:deploy_to) %>/current/<%= fetch(:nginx_static_dir) %>; }
 
   error_page 500 /500.html;
-  location /500.html { root <%= fetch  (:deploy_to) %>/current/<%= fetch(:static_dir) %>; }
+  location /500.html { root <%= fetch  (:deploy_to) %>/current/<%= fetch(:nginx_static_dir) %>; }
 
   client_max_body_size 4G;
   keepalive_timeout 10;

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-nginx
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Juan Ignacio Donoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Adds suuport to nginx for Capistrano 3.x
@@ -65,12 +65,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []