greenonline_capistrano_recipes 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53ccdf840a5de26a46cdcf172b5a9d1adb3177cf
-  data.tar.gz: ca88442c1c6cd7decf0702e0c5dc9bfbc84cdc64
+  metadata.gz: 8664788005e0853a064bffda6defad17d2aa80bd
+  data.tar.gz: a40b3a7ec6ced83690e0ddf41330c8aa00bd7bc4
 SHA512:
-  metadata.gz: a9c73454ae2a851988ddc82bdb3bf9bbe47dcc8be7dbf64304debd0de07cbe341bfd5f1ed0583c6b1caeeb902ac7587a96e03e2b63c6318c8dce5ba87bc0d69b
-  data.tar.gz: adfd7700fe46e98dc03019bbbfd6edf3f00d37747b43910e788da2d54cf239a508e4a166896c6e5f65914380b5d31a9422911df318a0f795ff34e0771630b9ab
+  metadata.gz: 2042a3782f4a29238d0fa0a0f96371e03ce5b11e7056928e12e312fec217307bf324253a19e91d7f33ae3592fe9c1576f8a330f14b7d56eeccbfaee6f93b6abf
+  data.tar.gz: ec5a8f0956cff7a6abbf2fbfc16670b9d24659f2c73a560d70026a02cc2ae55c9af449b184da5ff6e5bca7bdacd9a689effd2d775f2fc6f7b0da63ff812d58b4

data/lib/greenonline/capistrano_recipes/version.rb

@@ -1,5 +1,5 @@
 module Greenonline
   module CapistranoRecipes
-    VERSION = "0.0.19"
+    VERSION = "0.0.20"
   end
 end

data/lib/greenonline/recipes/nginx.rb

@@ -4,8 +4,10 @@ module Capistrano
     set_default(:nginx_ssl_enabled, false)
     set_default(:nginx_ssl_path, '/etc/ssl/')
     set_default(:nginx_ssl_key, nil)
+    set_default(:nginx_ssl_ip, nil)
     set_default(:nginx_ssl_certificate, nil)
     set_default(:nginx_config_path, '/etc/nginx/conf.d/')
+    set_default(:error_500_path, '/500.html')
 
     set_default(:nginx_wordpress_enabled, false)
     set_default(:nginx_wordpress_root, nil)

data/lib/greenonline/recipes/templates/nginx_unicorn.erb

@@ -118,19 +118,25 @@ server {
     proxy_pass http://unicorn_<%= application.downcase %>_<%= stage %>;
   }
 
-  error_page 500 502 503 504 /500.html;
+  error_page 500 502 503 504 <%= error_500_path ? error_500_path : '/500.html' %>;
   client_max_body_size 4G;
   keepalive_timeout 10;
 }
 
 <% if nginx_ssl_enabled %>
 server {
-  listen 443;
+  listen <%= nginx_ssl_ip ? "#{nginx_ssl_ip}:" : '' %>443;
 
   ssl on;
   ssl_certificate <%= nginx_ssl_path %><%= nginx_ssl_certificate %>;
   ssl_certificate_key <%= nginx_ssl_path %><%= nginx_ssl_key %>;
 
+  ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+  ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA;
+  ssl_prefer_server_ciphers on;
+  ssl_session_cache shared:SSL:10m;
+  ssl_session_timeout 10m;
+
   <% if nginx_server_name %>
   server_name <%= nginx_server_name %>;
   <% end  %>
@@ -170,8 +176,8 @@ server {
     proxy_pass http://unicorn_<%= application.downcase %>_<%= stage %>;
   }
 
-  error_page 500 502 503 504 /500.html;
+  error_page 500 502 503 504 <%= error_500_path ? error_500_path : '/500.html' %>;
   client_max_body_size 4G;
-  keepalive_timeout 10;
+  keepalive_timeout 70;
 }
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: greenonline_capistrano_recipes
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Pieter Visser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Capistrano Recipes