capistrano-generals 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce4edad6fe2a55d648cc2d1cd94efb7990d316ba
-  data.tar.gz: 4f583f9e7c648daafc2d38b57af1f82b5d2e409a
+  metadata.gz: 6958d037b48a6f96e67815862bc0797b377de9b5
+  data.tar.gz: 087d7b7ecaf011a90159db4e624d6f35fa413683
 SHA512:
-  metadata.gz: c4996378b3e7964dae3ca0d761e29d6f53e6cc27cfee034de5d8e3bf75c19cc6bae6cb81b86c50913d1c457b51a1811dfd0d2b8fc5257ead6f7933b368749551
-  data.tar.gz: 73628d76d1b34286d780fcb4ac5be17504fd9f2a14082c78a8d2dbd08d8c99b8e0b59fb54ed9e6f4a143c9dcc161cbc6a121b879e5cd9f78b8753384829fe634
+  metadata.gz: 0ad8a6ec7a456390e7d692fd9a952871c00534bc464b49e5d8fb6fd6562d13276407ff4be7dab55d2b3faca19d3507ea737a2a6165f479aeeb3621563a0be322
+  data.tar.gz: a57801044b81bb0d5c217b776a2003ee94db54d87f17af66d13611e61d01c074ebcdcfabf8e44f01d57da0fef64d4fddf50b398e3b71b72c5f5a1cd7b5065d85

data/lib/capistrano/generals/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Generals
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/capistrano/tasks/defaults.rake

@@ -20,7 +20,7 @@ namespace :load do
     # Nginx ssl settings
     set :nginx_use_ssl, false
     set :nginx_ssl_stapling, true
-    set :nginx_ssl_ciphers, 'AES128+EECDH:AES128+EDH:!aNULL'
+    set :nginx_ssl_ciphers, 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH;'
     set :nginx_ssl_protocols, 'TLSv1 TLSv1.1 TLSv1.2'
     set :nginx_ssl_session_cache, 'shared:SSL:10m'
 

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

@@ -62,16 +62,20 @@ server {
   ssl_dhparam <%= remote_ssl_dhparam_file %>;
   <% end %>
 
-  <% else %>
-  listen 80;
-  <% end %>
-
   <% if fetch(:ngingx_strict_transport_security) %>
+  <% if fetch(:nginx_respond_to_subdomains) %>
+  add_header Strict-Transport-Security "max-age=63072000; includeSubdomains; preload";
+  <% else %>
   add_header Strict-Transport-Security max-age=63072000;
+  <% end %>
   add_header X-Content-Type-Options nosniff;
   <% end %>
-  add_header X-Frame-Options <%= fetch(:nginx_x_frame_options) %>;
 
+  <% else %>
+  listen 80;
+  <% end %>
+
+  add_header X-Frame-Options <%= fetch(:nginx_x_frame_options) %>;
 
   <% # FILE HANDLING %>
   <% if fetch(:use_unicorn) %>

data/lib/generators/capistrano/generals/templates/puma.rb.erb

@@ -4,6 +4,7 @@ bind "unix:///tmp/puma.<%= fetch(:app_config_name) %>.sock"
 
 threads <%= fetch(:puma_min_threads) %>, <%= fetch(:puma_max_threads) %>
 workers <%= fetch(:puma_workers) %>
+pidfile "<%= fetch(:puma_pid) %>"
 
 <% if fetch(:puma_preload_app) %>
 preload_app!

data/lib/generators/capistrano/generals/templates/puma_init.sh.erb

@@ -20,16 +20,10 @@ CMD="export HOME; true "${HOME:=$(getent passwd "$AS_USER" | cut -d: -f6;)}"; cd
 
 set -u
 
-OLD_PIN="$PID.oldbin"
-
 sig () {
   test -s "$PID" && kill -$1 `cat $PID`
 }
 
-oldsig () {
-  test -s $OLD_PIN && kill -$1 `cat $OLD_PIN`
-}
-
 run () {
   if [ "$(id -un)" = "$AS_USER" ]; then
     eval $1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-generals
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Stef Schenkelaars