capistrano-generals 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5cfafd2788270fa55b0f631c3a66da6621bdc50
-  data.tar.gz: 4a866226d9a0000ac70b7a2010276478059387d9
+  metadata.gz: c5e57a16544bbd49b10dad7f8cfb9dd62ab69ed1
+  data.tar.gz: baa7acb4e3203391187fd1c21f63d4db5c6d5729
 SHA512:
-  metadata.gz: fdd94fba01c7372f6037742824a9daa6e86d2f819b05a4f7a5055e25164a56637d431aece1913f04a76a1cfb0e21ebbe418abca7f77e74549fdf302e4b84d965
-  data.tar.gz: fdd93d1e0f96671ae8911d8a88fb47e2a46b4955f93a8c98c55816a3c25b215124f4deaf12fc1281f9ed4694ae150a08388450bcfa5a3d03dd067aa286729589
+  metadata.gz: 58780943a33a415f348922db65c40dc18cd2366b675a2b21ddc94763269148b2a9060f905285ea06f1dbdffe523c176d1f1cc7e71ec384edf8112e3d384b75b4
+  data.tar.gz: 12c53e959ae704971b1a372b45497f100d987827a9cffced84884407c2756e4a9cb4ebce17f7041de86087cbbb736d3129f81fea2a2039795869b73b502c91df

data/lib/capistrano/generals/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Generals
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/lib/capistrano/tasks/defaults.rake

@@ -14,8 +14,11 @@ namespace :load do
     set :nginx_redirect_www, true
     set :nginx_fail_timeout, 0
     set :nginx_x_frame_options, 'DENY'
-    set :ngingx_strict_transport_security, true
+    set :ngingx_strict_transport_security, false
     set :nginx_respond_to_subdomains, false
+    set :nginx_resolver, '8.8.4.4 8.8.8.8 valid=300s'
+    set :nginx_resolver_timeout, '10s'
+    set :nginx_custom_block, ''
 
     # Nginx ssl settings
     set :nginx_use_ssl, false
@@ -24,6 +27,11 @@ namespace :load do
     set :nginx_ssl_protocols, 'TLSv1 TLSv1.1 TLSv1.2'
     set :nginx_ssl_session_cache, 'shared:SSL:10m'
 
+    # Nginx caching settings
+    set :cache_static_files, true
+    set :cache_custom, ''
+    set :cache_custom_expire, 'max'
+
     # SSL Settings
     set :local_certs_folder, 'config/deploy/certs'
     set :remote_certs_folder, '/etc/ssl'

data/lib/generators/capistrano/generals/templates/nginx.conf.erb

@@ -19,9 +19,9 @@ server {
   listen 80;
   server_name www.<%= fetch(:server_domain) %>;
   <% if fetch(:nginx_use_ssl) %>
-  return 301 https://<%= fetch(:server_domain) %>$request_uri;
+  return 302 https://<%= fetch(:server_domain) %>$request_uri;
   <% else %>
-  return 301 http://<%= fetch(:server_domain) %>$request_uri;
+  return 302 http://<%= fetch(:server_domain) %>$request_uri;
   <% end %>
 }
 <% end %>
@@ -29,7 +29,7 @@ server {
 server {
   listen 80;
   server_name <%= "*.#{fetch(:server_domain)}" if fetch(:nginx_respond_to_subdomains) %> <%= fetch(:server_domain) %>;
-  rewrite ^(.*) https://$host$1 permanent;
+  return 302 https://<%= fetch(:server_domain) %>$request_uri;
 }
 <% end %>
 
@@ -39,6 +39,8 @@ server {
   server_name <%= "*.#{fetch(:server_domain)}" if fetch(:nginx_respond_to_subdomains) %> <%= fetch(:server_domain) %>;
   root <%= current_path %>/public;
 
+  <%= fetch(:nginx_custom_block) %>
+
   client_max_body_size 4G;
   keepalive_timeout 10;
 
@@ -57,8 +59,11 @@ server {
   <% if fetch(:nginx_ssl_stapling) %>
   ssl_stapling on;
   ssl_stapling_verify on;
-  resolver 8.8.4.4 8.8.8.8 valid=300s;
-  resolver_timeout 10s;
+  <% end %>
+
+  <% if fetch(:nginx_resolver).length > 0 %>
+  resolver <%= fetch(:nginx_resolver) %>;
+  resolver_timeout <%= fetch(:nginx_resolver_timeout) %>;
   <% end %>
 
   <% if fetch(:ssl_server_ciphers) %>
@@ -110,17 +115,18 @@ server {
   }
   <% end %>
 
-  location ~* ^/assets/ {
-    # Per RFC2616 - 1 year maximum expiry
-    expires 1y;
+  <% if fetch(:cache_static_files) %>
+  location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc|css|js)$ {
+    expires max;
     add_header Cache-Control public;
+  }
+  <% end %>
 
-    # Some browsers still send conditional-GET requests if there's a
-    # Last-Modified header or an ETag header even if they haven't
-    # reached the expiry date sent in the Expires header.
-    add_header Last-Modified "";
-    add_header ETag "";
-    break;
+  <% if fetch(:cache_custom).length > 0 %>
+  location <%= fetch(:cache_custom) %> {
+    expires <%= fetch(:cache_custom_expire) %>;
+    add_header Cache-Control public;
   }
+  <% end %>
 
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-generals
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Stef Schenkelaars
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano