Added support for http/2 and more configurable variables, FreeBSD.

.gitignore

@@ -17,3 +17,4 @@ test/version_tmp
 tmp
 /vendor/ruby
 .idea
+/.c9

lib/capistrano/dsl/unicorn_paths.rb

@@ -3,7 +3,7 @@ module DSL
     module UnicornPaths
 
       def unicorn_initd_file
-        "/etc/init.d/#{fetch(:unicorn_service)}"
+        "#{fetch(:unicorn_init_path)}/#{fetch(:unicorn_service)}"
       end
 
       def unicorn_default_config_file
@@ -31,4 +31,4 @@ def unicorn_default_logrotate_config_file
       end
     end
   end
-end
+end

lib/capistrano/tasks/nginx.rake

@@ -6,6 +6,8 @@ include Capistrano::DSL::NginxPaths
 
 namespace :load do
   task :defaults do
+    set :root_name, 'root'
+    set :root_group, 'wheel'
     set :templates_path, 'config/deploy/templates'
     set :nginx_config_name, -> { "#{fetch(:application)}_#{fetch(:stage)}" }
     set :nginx_pid, nginx_default_pid_file
@@ -15,6 +17,8 @@ namespace :load do
     set :nginx_location, '/etc/nginx'
     set :nginx_use_ssl, false
     set :nginx_use_spdy, false
+    # http v2 protocol
+    set :nginx_use_http_v2, false
     # if true, passes the SSL client certificate to the application server for consumption in Ruby code
     set :nginx_pass_ssl_client_cert, false
     set :nginx_ssl_cert, -> { nginx_default_ssl_cert_file_name }
@@ -26,7 +30,8 @@ namespace :load do
     set :nginx_ssl_cert_key_local_path, -> { ask(:nginx_ssl_cert_key_local_path, 'Local path to ssl certificate key: ') }
     set :nginx_fail_timeout, 0 # see http://nginx.org/en/docs/http/ngx_http_upstream_module.html#fail_timeout
     set :nginx_read_timeout, nil
-
+    set :nginx_dhparam, '/etc/nginx/ssl/dhparam.pem'
+
     set :linked_dirs, fetch(:linked_dirs, []).push('log')
   end
 end
@@ -56,9 +61,9 @@ namespace :nginx do
       if fetch(:nginx_upload_local_cert)
         sudo_upload! fetch(:nginx_ssl_cert_local_path), nginx_ssl_cert_file
         sudo_upload! fetch(:nginx_ssl_cert_key_local_path), nginx_ssl_cert_key_file
+        sudo :chown, "#{fetch(:root_name)}:#{fetch(:root_group)}", nginx_ssl_cert_file
+        sudo :chown, "#{fetch(:root_name)}:#{fetch(:root_group)}", nginx_ssl_cert_key_file
       end
-      sudo :chown, 'root:root', nginx_ssl_cert_file
-      sudo :chown, 'root:root', nginx_ssl_cert_key_file
     end
   end
 

lib/capistrano/tasks/unicorn.rake

@@ -6,6 +6,7 @@ include Capistrano::DSL::UnicornPaths
 
 namespace :load do
   task :defaults do
+    set :unicorn_init_path, '/etc/init.d'
     set :unicorn_service, -> { "unicorn_#{fetch(:application)}_#{fetch(:stage)}" }
     set :templates_path, 'config/deploy/templates'
     set :unicorn_pid, -> { unicorn_default_pid_file }
@@ -18,6 +19,9 @@ namespace :load do
     set :unicorn_use_tcp, -> { roles(:app, :web).count > 1 } # use tcp if web and app nodes are on different servers
     set :unicorn_app_env, -> { fetch(:rails_env) || fetch(:stage) }
     # set :unicorn_user # default set in `unicorn:defaults` task
+
+    set :unicorn_use_update_rc_d, true
+    set :unicorn_use_init_script, false
 
     set :unicorn_logrotate_enabled, false # by default, don't use logrotate to rotate unicorn logs
 
@@ -38,7 +42,7 @@ namespace :unicorn do
     on roles :app do
       sudo_upload! template('unicorn_init.erb'), unicorn_initd_file
       execute :chmod, '+x', unicorn_initd_file
-      sudo 'update-rc.d', '-f', fetch(:unicorn_service), 'defaults'
+      sudo('update-rc.d', '-f', fetch(:unicorn_service), 'defaults') if fetch(:unicorn_use_update_rc_d)
     end
   end
 
@@ -55,15 +59,19 @@ namespace :unicorn do
     on roles :app do
       sudo :mkdir, '-pv', File.dirname(fetch(:unicorn_logrotate_config))
       sudo_upload! template('unicorn-logrotate.rb.erb'), fetch(:unicorn_logrotate_config)
-      sudo 'chown', 'root:root', fetch(:unicorn_logrotate_config)
+      sudo 'chown', "#{fetch(:root_name)}:#{fetch(:root_group)}", fetch(:unicorn_logrotate_config)
     end
   end
 
   %w[start stop restart reload].each do |command|
     desc "#{command} unicorn"
     task command do
       on roles :app do
-        sudo 'service', fetch(:unicorn_service), command
+        if fetch(:unicorn_use_init_script)
+          sudo unicorn_initd_file, command
+        else
+          sudo 'service', fetch(:unicorn_service), command
+        end
       end
     end
   end

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

@@ -9,12 +9,20 @@ server {
 <% if fetch(:nginx_use_ssl) -%>
     <% if fetch(:nginx_use_spdy) -%>
     listen <%= ssl_port %> spdy;
+    <% elsif fetch(:nginx_use_http_v2) -%>
+    listen <%= ssl_port %> http2;
     <% else -%>
     listen <%= ssl_port %>;
     <% end -%>
     ssl on;
+    <% if fetch(:nginx_ssl_cert) and not fetch(:nginx_upload_local_cert) -%>
+    ssl_certificate <%= fetch(:nginx_ssl_cert) %>;
+    ssl_certificate_key <%= fetch(:nginx_ssl_cert_key) %>;
+    <% else -%>
     ssl_certificate <%= nginx_ssl_cert_file %>;
     ssl_certificate_key <%= nginx_ssl_cert_key_file %>;
+    <% end-%>
+
 
     ssl_session_cache shared:SSL:10m;
     ssl_session_timeout 10m;
@@ -24,7 +32,7 @@ server {
 
     ssl_stapling on;
     ssl_stapling_verify on;
-    ssl_dhparam /etc/nginx/ssl/dhparam.pem;
+    ssl_dhparam <%= fetch(:nginx_dhparam) %>;
 <% else -%>
     listen <%= fetch(:nginx_server_port) %>;
 <% end -%>

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

@@ -1,18 +1,18 @@
 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 -%>
-  server unix:/tmp/unicorn.<%= fetch(:nginx_config_name) %>.sock fail_timeout=<%= fetch(:nginx_fail_timeout) %>;
+    server unix:/tmp/unicorn.<%= fetch(:nginx_config_name) %>.sock fail_timeout=<%= fetch(:nginx_fail_timeout) %>;
 <% end -%>
 }
 
 <% if fetch(:nginx_use_ssl) -%>
 server {
-  listen <%= fetch(:nginx_server_port) %>;
-  server_name <%= fetch(:nginx_server_name) %>;
-  rewrite ^(.*) https://$host$1 permanent;
+    listen <%= fetch(:nginx_server_port) %>;
+    server_name <%= fetch(:nginx_server_name) %>;
+    rewrite ^(.*) https://$host$1 permanent;
 }
 <% end -%>