deploify 0.2.7 → 0.2.8

data/deploify.gemspec

@@ -6,7 +6,7 @@ require 'deploify/version'
 Gem::Specification.new do |gem|
   gem.name          = "deploify"
   gem.version       = Deploify::VERSION
-  gem.authors       = ["Richard R\314\214i\314\201man"]
+  gem.authors       = ["Richard Riman"]
   gem.email         = ["riman.richard@gmail.com"]
   gem.description   = "deploify - capistrano based and deprec inspired deploy solution served as a gem"
   gem.summary       = "capistrano based and deprec inspired deploy gem"

data/lib/deploify/templates/nginx/vhost_http_force_ssl.conf.erb

@@ -36,6 +36,10 @@ server {
     auth_basic "Limited access";
     auth_basic_user_file <%= "#{deploy_to}/nginx/.htaccess" %>;
     <% end -%>
+    try_files $uri @upstream;
+  }
+
+  location @upstream {
     proxy_pass http://<%= nginx_upstream_name %>;
     proxy_redirect off;
     proxy_set_header Host $host;
@@ -57,23 +61,14 @@ server {
   # set Expire header on assets: see http://developer.yahoo.com/performance/rules.html#expires
   location ~ ^/(images|javascripts|stylesheets)/ {
     expires max;
-    error_page 404 = @fallback;
+    error_page 404 = @upstream;
   }
 
   location ~ ^/assets/ {
     expires max;
     add_header Cache-Control public;
     add_header ETag "";
-    error_page 404 = @fallback;
-  }
-
-  location @fallback {
-    proxy_pass http://<%= nginx_upstream_name %>;
-    proxy_redirect off;
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto https;
+    error_page 404 = @upstream;
   }
 
   error_page 404 /404.html;

data/lib/deploify/templates/nginx/vhost_http_only.conf.erb

@@ -23,6 +23,10 @@ server {
     auth_basic "Limited access";
     auth_basic_user_file <%= "#{deploy_to}/nginx/.htaccess" %>;
     <% end -%>
+    try_files $uri @upstream;
+  }
+
+  location @upstream {
     proxy_pass http://<%= nginx_upstream_name %>;
     proxy_redirect off;
     proxy_set_header Host $host;
@@ -44,23 +48,14 @@ server {
   # set Expire header on assets: see http://developer.yahoo.com/performance/rules.html#expires
   location ~ ^/(images|javascripts|stylesheets)/ {
     expires max;
-    error_page 404 = @fallback;
+    error_page 404 = @upstream;
   }
 
   location ~ ^/assets/ {
     expires max;
     add_header Cache-Control public;
     add_header ETag "";
-    error_page 404 = @fallback;
-  }
-
-  location @fallback {
-    proxy_pass http://<%= nginx_upstream_name %>;
-    proxy_redirect off;
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto http;
+    error_page 404 = @upstream;
   }
 
   error_page 404 /404.html;

data/lib/deploify/templates/nginx/vhost_http_with_ssl.conf.erb

@@ -23,6 +23,10 @@ server {
     auth_basic "Limited access";
     auth_basic_user_file <%= "#{deploy_to}/nginx/.htaccess" %>;
     <% end -%>
+    try_files $uri @upstream;
+  }
+
+  location @upstream {
     proxy_pass http://<%= nginx_upstream_name %>;
     proxy_redirect off;
     proxy_set_header Host $host;
@@ -44,23 +48,14 @@ server {
   # set Expire header on assets: see http://developer.yahoo.com/performance/rules.html#expires
   location ~ ^/(images|javascripts|stylesheets)/ {
     expires max;
-    error_page 404 = @fallback;
+    error_page 404 = @upstream;
   }
 
   location ~ ^/assets/ {
     expires max;
     add_header Cache-Control public;
     add_header ETag "";
-    error_page 404 = @fallback;
-  }
-
-  location @fallback {
-    proxy_pass http://<%= nginx_upstream_name %>;
-    proxy_redirect off;
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto http;
+    error_page 404 = @upstream;
   }
 
   error_page 404 /404.html;
@@ -95,6 +90,10 @@ server {
     auth_basic "Limited access";
     auth_basic_user_file <%= "#{deploy_to}/nginx/.htaccess" %>;
     <% end -%>
+    try_files $uri @upstream;
+  }
+
+  location @upstream {
     proxy_pass http://<%= nginx_upstream_name %>;
     proxy_redirect off;
     proxy_set_header Host $host;
@@ -116,16 +115,14 @@ server {
   # set Expire header on assets: see http://developer.yahoo.com/performance/rules.html#expires
   location ~ ^/(images|javascripts|stylesheets)/ {
     expires max;
-    error_page 404 = @fallback;
+    error_page 404 = @upstream;
   }
 
-  location @fallback {
-    proxy_pass http://<%= nginx_upstream_name %>;
-    proxy_redirect off;
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto https;
+  location ~ ^/assets/ {
+    expires max;
+    add_header Cache-Control public;
+    add_header ETag "";
+    error_page 404 = @upstream;
   }
 
   error_page 404 /404.html;

data/lib/deploify/version.rb

@@ -1,7 +1,7 @@
 module Deploify
   MAJOR = 0
   MINOR = 2
-  PATCH = 7
+  PATCH = 8
   BUILD = nil
 
   if BUILD.nil?

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: deploify
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
-- "Richard R\xCC\x8Ci\xCC\x81man"
+- Richard Riman
 autorequire: 
 bindir: bin
 cert_chain: []