capistrano-unicorn-nginx 3.3.3 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bb3ef3f0c2a5ffce9901e6c13e7429d6580afe7
-  data.tar.gz: b10988520574834d2e1c1a656d4d6061a46f4ab6
+  metadata.gz: b5914ce5a8fa29d660ca4ed8002d0bd1ca7ab7f6
+  data.tar.gz: 85dd5c4b635c5f9ce402a6649e20a79832b0688e
 SHA512:
-  metadata.gz: 6036237105e57ca6cff51ac0c715fb255e152768db9cee5fbf7f3d960235da3e9876f5c73caa76aee759de1ef1fc92c52f7ad7187b27ddc4c4320e629920634c
-  data.tar.gz: 72015998373a8de90105f89ae0b787c97b40d3d7323058e350fbb2ed3be1b74335d11c72735641fd1a844194ff7f440b285ae26ca455d44872d64e9d42a2c43a
+  metadata.gz: f22e4b399e997f4fa8b813a23e1ebade0ea889fcfd74602022c1c4c8bf963b6a0c767d26dfb1983be9c6fbdbec4caa176ad3d4e22dd7cb87ff982f809585424e
+  data.tar.gz: 9ece26bc3dce9f5ab4dc19f6845eba4532c1302c7871224278046a8e1026ab98db0339065987bc6efd13fdfea30cc973607a983346937a4b09afb7b6e18842f2

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ### master
 
+### v3.4.0, 2015-09-17
+- Allow customizing paths for SSL certificate and key
+- Use sudo to restart services
+- Remove whitespace in template ERB files
+
+
 ### v3.3.3, 2015-05-05
 - add `unicorn_env` option for passing environmental variables to unicorn (@rhomeister)
 

data/lib/capistrano/dsl/nginx_paths.rb

@@ -27,12 +27,20 @@ module Capistrano
         "#{fetch(:nginx_server_name)}.key"
       end
 
+      def nginx_default_ssl_cert_file_path
+        "/etc/ssl/certs/"
+      end
+
+      def nginx_default_ssl_cert_key_file_path
+        "/etc/ssl/private/"
+      end
+
       def nginx_ssl_cert_file
-        "/etc/ssl/certs/#{fetch(:nginx_ssl_cert)}"
+        "#{fetch(:nginx_ssl_cert_path)}#{fetch(:nginx_ssl_cert)}"
       end
 
       def nginx_ssl_cert_key_file
-        "/etc/ssl/private/#{fetch(:nginx_ssl_cert_key)}"
+        "#{fetch(:nginx_ssl_cert_key_path)}#{fetch(:nginx_ssl_cert_key)}"
       end
 
       # log files

data/lib/capistrano/tasks/nginx.rake

@@ -18,6 +18,8 @@ namespace :load do
     set :nginx_pass_ssl_client_cert, false
     set :nginx_ssl_cert, -> { nginx_default_ssl_cert_file_name }
     set :nginx_ssl_cert_key, -> { nginx_default_ssl_cert_key_file_name }
+    set :nginx_ssl_cert_path, -> { nginx_default_ssl_cert_file_path }
+    set :nginx_ssl_cert_key_path, -> { nginx_default_ssl_cert_key_file_path }
     set :nginx_upload_local_cert, true
     set :nginx_ssl_cert_local_path, -> { ask(:nginx_ssl_cert_local_path, 'Local path to ssl certificate: ') }
     set :nginx_ssl_cert_key_local_path, -> { ask(:nginx_ssl_cert_key_local_path, 'Local path to ssl certificate key: ') }

data/lib/capistrano/tasks/unicorn.rake

@@ -63,7 +63,7 @@ namespace :unicorn do
     desc "#{command} unicorn"
     task command do
       on roles :app do
-        execute :service, fetch(:unicorn_service), command
+        sudo 'service', fetch(:unicorn_service), command
       end
     end
   end

data/lib/capistrano/unicorn_nginx/helpers.rb

@@ -17,7 +17,7 @@ module Capistrano
           config_file = File.join(File.dirname(__FILE__), "../../generators/capistrano/unicorn_nginx/templates/#{template_name}")
         end
 
-        ERB.new(File.read(config_file)).result(ERBNamespace.new(locals).get_binding)
+        ERB.new(File.read(config_file), nil, '-').result(ERBNamespace.new(locals).get_binding)
       end
 
       # renders the ERB template specified by template_name to a StringIO buffer

data/lib/capistrano/unicorn_nginx/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module UnicornNginx
-    VERSION = "3.3.3"
+    VERSION = "3.4.0"
   end
 end

data/lib/generators/capistrano/unicorn_nginx/templates/_default_server_directive.erb

@@ -1,13 +1,13 @@
-<% if fetch(:nginx_use_ssl) && nginx_pass_ssl_client_cert %>
+<% if fetch(:nginx_use_ssl) && nginx_pass_ssl_client_cert -%>
 # source: http://forum.nginx.org/read.php?2,236546,236596
 map $ssl_client_raw_cert $a {
     "~^(-.*-\n)(?<1st>[^\n]+)\n((?<b>[^\n]+)\n)?((?<c>[^\n]+)\n)?((?<d>[^\n]+)\n)?((?<e>[^\n]+)\n)?((?<f>[^\n]+)\n)?((?<g>[^\n]+)\n)?((?<h>[^\n]+)\n)?((?<i>[^\n]+)\n)?((?<j>[^\n]+)\n)?((?<k>[^\n]+)\n)?((?<l>[^\n]+)\n)?((?<m>[^\n]+)\n)?((?<n>[^\n]+)\n)?((?<o>[^\n]+)\n)?((?<p>[^\n]+)\n)?((?<q>[^\n]+)\n)?((?<r>[^\n]+)\n)?((?<s>[^\n]+)\n)?((?<t>[^\n]+)\n)?((?<v>[^\n]+)\n)?((?<u>[^\n]+)\n)?((?<w>[^\n]+)\n)?((?<x>[^\n]+)\n)?((?<y>[^\n]+)\n)?((?<z>[^\n]+)\n)?(-.*-)$" $1st;
 }
-<% end %>
+<% end -%>
 
 server {
-<% if fetch(:nginx_use_ssl) %>
-    <% if fetch(:nginx_use_spdy) %>
+<% if fetch(:nginx_use_ssl) -%>
+    <% if fetch(:nginx_use_spdy) -%>
     listen <%= ssl_port %> spdy;
     <% else %>
     listen <%= ssl_port %>;
@@ -15,13 +15,13 @@ server {
     ssl on;
     ssl_certificate <%= nginx_ssl_cert_file %>;
     ssl_certificate_key <%= nginx_ssl_cert_key_file %>;
-<% else %>
+<% else -%>
     listen 80;
-<% end %>
+<% end -%>
 
-<% if fetch(:nginx_use_ssl) && nginx_pass_ssl_client_cert %>
+<% if fetch(:nginx_use_ssl) && nginx_pass_ssl_client_cert -%>
     ssl_verify_client optional_no_ca;
-<% end %>
+<% end -%>
 
     client_max_body_size 4G;
     keepalive_timeout 10;
@@ -37,13 +37,13 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header Host $http_host;
         proxy_redirect off;
-        <% if fetch(:nginx_use_ssl) %>
+        <% if fetch(:nginx_use_ssl) -%>
         proxy_set_header X-Forwarded-Proto https;
-        <% end %>
-        <% if fetch(:nginx_use_ssl) && nginx_pass_ssl_client_cert %>
+        <% end -%>
+        <% if fetch(:nginx_use_ssl) && nginx_pass_ssl_client_cert -%>
         # source: http://forum.nginx.org/read.php?2,236546,236596
         proxy_set_header X-Client-Cert $a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s$t$v$u$w$x$y$z;
-        <% end %>
+        <% end -%>
 
         proxy_pass http://unicorn_<%= fetch(:nginx_config_name) %>;
         # limit_req zone=one;

data/lib/generators/capistrano/unicorn_nginx/templates/nginx_conf.erb

@@ -1,25 +1,25 @@
 upstream unicorn_<%= fetch(:nginx_config_name) %> {
-<% if fetch(:unicorn_use_tcp) %>
-  <% roles(:app).each do |role| %>
+<% if fetch(:unicorn_use_tcp) -%>
+  <% roles(:app).each do |role| -%>
     server <%= role.hostname %>:<%= fetch(:unicorn_tcp_listen_port)%> fail_timeout=<%= fetch(:nginx_fail_timeout) %>;
-  <% end %>
-<% else %>
+  <% end -%>
+<% else -%>
   server unix:/tmp/unicorn.<%= fetch(:nginx_config_name) %>.sock fail_timeout=<%= fetch(:nginx_fail_timeout) %>;
-<% end %>
+<% end -%>
 }
 
-<% if fetch(:nginx_use_ssl) %>
+<% if fetch(:nginx_use_ssl) -%>
 server {
   listen 80;
   server_name <%= fetch(:nginx_server_name) %>;
   rewrite ^(.*) https://$host$1 permanent;
 }
-<% end %>
+<% end -%>
 
 <% # render the default server directive. If SSL is enabled, port 443 is used %>
 <%= template_to_s("_default_server_directive.erb", ssl_port: 443, nginx_pass_ssl_client_cert: false).to_s %>
 
-<% if fetch(:nginx_pass_ssl_client_cert) %>
+<% if fetch(:nginx_pass_ssl_client_cert) -%>
 <% # render the server directive with SSL client certificate authentication enabled on port 444 %>
 <%= template_to_s("_default_server_directive.erb", ssl_port: 444, nginx_pass_ssl_client_cert: true).to_s %>
-<% end %>
+<% end -%>

data/lib/generators/capistrano/unicorn_nginx/templates/unicorn.rb.erb

@@ -3,11 +3,11 @@ pid "<%= fetch(:unicorn_pid) %>"
 stdout_path "<%= unicorn_log_file %>"
 stderr_path "<%= unicorn_error_log_file %>"
 
-<% if fetch(:unicorn_use_tcp) %>
+<% if fetch(:unicorn_use_tcp) -%>
 listen <%= fetch(:unicorn_tcp_listen_port) %>
-<% else %>
+<% else -%>
 listen "/tmp/unicorn.<%= fetch(:nginx_config_name) %>.sock"
-<% end %>
+<% end -%>
 
 worker_processes <%= fetch(:unicorn_workers) %>
 timeout <%= fetch(:unicorn_worker_timeout) %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-unicorn-nginx
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.4.0
 platform: ruby
 authors:
 - Ruben Stranders
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Capistrano tasks for automatic and sensible unicorn + nginx configuraion.