capistrano-unformatt 1.1 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb64c9982f376eee373059b9658ef04211f1e175
-  data.tar.gz: efc62c89556e2ec368e3ba33e14a770e5f004fdb
+  metadata.gz: ae7b9e2cb109a5ac464ff131875a670fafba2a8b
+  data.tar.gz: 373438a5a8ef4d16af7323f565b8b6e99264416d
 SHA512:
-  metadata.gz: c48568ba5dd46d38ecc6826f0413b5efc7cbe879eebcf5102b4ed08bd55ffcb7d6aabcf118157ca23cedfefca9225c28ee2289c76fd44c6beb98f2ed3590e70a
-  data.tar.gz: d0d00d96995a0d38f02febb3994e60d559ea3cb477b1f72b70d3413bbf34ea0ad3b8082b1340874662a7c73c69d677e72bb6751f02a0c1bd07114debcaf968f4
+  metadata.gz: 6b0e75b0037c6be5ea676510150c4082576d2bafc37617e4a9cab3cdf7fbfd34ebd4e28821c60ae500ab5c6b5d1d94418ef4e302e8f42495bafabcdca0f1000b
+  data.tar.gz: b6b53e26f720b07ede0cb157aeb2a77b6b69fcd63c688c84d8a896b533a0c1b0139b65ff37321cb9ae6befac53c3659fdca7a9067202c9a73c71352c7511407d

data/CHANGELOG.md

@@ -29,3 +29,11 @@
 ## v1.1
 
 * Fixed style on unicorn rb file
+
+## v1.2
+
+* Improvements on recipes
+
+## v1.3
+
+* Added configuration variables on templates

data/capistrano-unformatt.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "capistrano-unformatt"
-  spec.version       = '1.1'
+  spec.version       = '1.3'
   spec.authors       = ["unformatt"]
   spec.email         = ["unformatt@gmail.com"]
   spec.description   = "Custom recipes for Unformatt projects"

data/vendor/templates/nginx.conf.erb

@@ -4,7 +4,7 @@ upstream <%=fetch(:application)%> {
 
 <%- if fetch(:nginx_use_ssl) -%>
 server {
-  listen         80;
+  listen         <%= fetch(:nginx_http_port, 80) %>;
   server_name    <%=fetch(:nginx_server_names)%>;
   rewrite        ^ https://$server_name$request_uri? permanent;
 }
@@ -12,7 +12,7 @@ server {
 
 server {
   <%- if fetch(:nginx_use_ssl) -%>
-  listen 443;
+  listen <%= fetch(:nginx_https_port, 443) %>;
   ssl                 on;
   ssl_certificate <%=fetch(:nginx_ssl_certificate)%>;
   ssl_certificate_key <%=fetch(:nginx_ssl_private_key)%>;
@@ -30,8 +30,8 @@ server {
   error_log <%=shared_path%>/log/nginx-error.log;
   rewrite_log on;
 
-  client_max_body_size 4G;
-  keepalive_timeout 5;
+  client_max_body_size <%=fetch(:nginx_max_body_size, '4G')%>;
+  keepalive_timeout <%=fetch(:nginx_keepalive_timeout, '5')%>;
 
   if (-f $document_root/public/maintenance.html) {
     rewrite ^(.*)$ /public/maintenance.html;
@@ -62,9 +62,10 @@ server {
     <%- if fetch(:nginx_use_ssl) -%>
     proxy_set_header                 X-Forwarded-Proto https;
     <%- end -%>
-    proxy_headers_hash_bucket_size   1024;
-    proxy_headers_hash_max_size      512;
-    proxy_read_timeout               <%=fetch(:nginx_read_timeout)%>;
+    proxy_headers_hash_bucket_size   <%=fetch(:nginx_hash_bucket_size, 1024)%>;
+    proxy_headers_hash_max_size      <%=fetch(:nginx_hash_max_size, 512)%>;
+    proxy_read_timeout               <%=fetch(:nginx_read_timeout, 60)%>;
+    proxy_send_timeout               <%=fetch(:nginx_send_timeout, 60)%>;
     proxy_redirect                   off;
     proxy_pass                       http://<%=fetch(:application)%>;
     include                          proxy_params;

data/vendor/templates/puma.daemon.erb

@@ -2,7 +2,7 @@
 
 # <%= "Start or stop #{fetch(:application)}-puma" %>
 #
-# Matias Hick <me@unformatt.com.ar>
+# <%= fetch(:daemon_author_name) %>
 
 ### BEGIN INIT INFO
 # Provides:          <%= "#{fetch(:application)}-puma" %>

data/vendor/templates/puma.rb.erb

@@ -1,14 +1,17 @@
 directory "<%=current_path%>"
-environment "production"
+environment "<%= fetch(:rails_env, 'production') %>"
 daemonize true
 
+worker_timeout <%= fetch(:app_server_timeout, 60) %>
+worker_boot_timeout <%= fetch(:app_server_timeout, fetch(:app_server_timeout, 60)) %>
+
 pidfile '<%="#{shared_path}/pids/puma.pid"%>'
 state_path '<%="#{shared_path}/pids/puma.state"%>'
 stdout_redirect "<%="#{shared_path}/log/puma.stdout.log"%>", "<%="#{shared_path}/log/puma.stderr.log"%>", true
 
-threads 0, 8
+threads <%= fetch(:app_server_min_threads, 0) %>, <%= fetch(:app_server_max_threads, 8) %>
 bind "<%="tcp://#{fetch(:app_server_host)}:#{fetch(:app_server_port)}"%>"
-workers 4
+workers <%= fetch(:app_server_workers, 4) %>
 
 preload_app!
 

data/vendor/templates/sidekiq.daemon.erb

@@ -2,7 +2,7 @@
 
 # <%= "Start or stop #{fetch(:application)}-sidekiq" %>
 #
-# Matias Hick <me@unformatt.com.ar>
+# <%= fetch(:daemon_author_name) %>
 
 ### BEGIN INIT INFO
 # Provides:          <%= "#{fetch(:application)}-sidekiq" %>
@@ -34,7 +34,7 @@ case "$1" in
 
     if [ -z "$(getPID)" ]; then
       cd <%=current_path%>
-      bundle exec sidekiq -d -v -P $PIDFILE -e $RAILS_ENV -L <%= "#{shared_path}/log/sidekiq.log" %>
+      bundle exec sidekiq -d -v -c <%= fetch(:sidekiq_threads_quantity, 4) %> -g <%= fetch(:sidekiq_queue_label, fetch(:sidekiq_queue_name, fetch(:application))) %> -q <%= fetch(:sidekiq_queue_name, fetch(:application)) %> -P $PIDFILE -e $RAILS_ENV -L <%= "#{shared_path}/log/sidekiq.log" %>
 
       echo "started!"
     else

data/vendor/templates/sidekiq.monit.erb

@@ -2,5 +2,5 @@ check process <%="#{fetch(:application)}-sidekiq"%>
   with pidfile <%="#{shared_path}/pids/sidekiq.pid"%>
   group <%=fetch(:application)%>
   start program = "<%="#{fetch(:daemons_path)}/#{fetch(:application)}-sidekiq start"%>"
-    as uid <%=fetch(:monit_user)%> and gid <%=fetch(:monit_group)%>
+    as uid <%=fetch(:monit_user,'root')%> and gid <%=fetch(:monit_group,'root')%>
   stop program = "<%="#{fetch(:daemons_path)}/#{fetch(:application)}-sidekiq stop"%>"

data/vendor/templates/sunspot.daemon.erb

@@ -2,7 +2,7 @@
 
 # <%= "Start or stop #{fetch(:application)}-sunspot" %>
 #
-# Matias Hick <me@unformatt.com.ar>
+# <%= fetch(:daemon_author_name) %>
 
 ### BEGIN INIT INFO
 # Provides:          <%= "#{fetch(:application)}-sunspot" %>

data/vendor/templates/unicorn.daemon.erb

@@ -2,7 +2,7 @@
 
 # <%= "Start or stop #{fetch(:application)}-unicorn" %>
 #
-# Matias Hick <me@unformatt.com.ar>
+# <%= fetch(:daemon_author_name) %>
 
 ### BEGIN INIT INFO
 # Provides:          <%= "#{fetch(:application)}-unicorn" %>

data/vendor/templates/unicorn.rb.erb

@@ -1,9 +1,9 @@
-ENV['RAILS_ENV'] = 'production'
-worker_processes 4
+ENV['RAILS_ENV'] = '<%= fetch(:rails_env, 'production') %>'
+worker_processes <%= fetch(:app_server_workers, 4) %>
 
 listen "<%="#{fetch(:app_server_host)}:#{fetch(:app_server_port)}"%>", :backlog => 2048
 
-timeout 60
+timeout <%= fetch(:app_server_timeout, 60) %>
 
 working_directory "<%=current_path%>"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-unformatt
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.3'
 platform: ruby
 authors:
 - unformatt