capistrano-generals 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f319507d8d54947688101b09464b1e48dd42500
-  data.tar.gz: adf969db6612469cb8f2679ed160ca88b175ca71
+  metadata.gz: 444259204853e083167932e870acd97c4360b00f
+  data.tar.gz: 78e81b15e2799d8e9328853fbf2859969ba821af
 SHA512:
-  metadata.gz: 7c0b23afa9b7f34465406cbd17411a526daa0fa058419d6ce00b8ceb0382984356bee6c6f9ae4f25baba9fb6032c3b9d9a4a423dfa8700cd55bf72110f16431b
-  data.tar.gz: 4dd2891487c2f5fe7e4006116c59a2d18f638454b9aafb30520d1c3c83f3d79db47a1a26d649987937357431b33a0a1fe5e069557412d87e06da960a37bbdec7
+  metadata.gz: e37ebac2df3d7812a98a550f8699a917cbc1e214406b7171f4613dda1c2378a4434eeb869ec8527f721ef0c027a1d7d532676744d42e5c585e955abe3e012e3c
+  data.tar.gz: 57657a23a0a7c8c4d2a9d2d20621513c48083fb5c0ce8da6121b66a11eea9c85766c5d58f161fcb84c435e24b357f7b396dc0a88b1ad9aa4ae61f9486f47a2e0

data/lib/capistrano/generals/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Generals
-    VERSION = "0.1.8"
+    VERSION = "0.1.10"
   end
 end

data/lib/capistrano/tasks/defaults.rake

@@ -19,6 +19,8 @@ namespace :load do
     set :nginx_resolver, '8.8.4.4 8.8.8.8 valid=300s'
     set :nginx_resolver_timeout, '10s'
     set :nginx_custom_block, ''
+    set :nginx_max_body_size, '4G'
+    set :nginx_keep_alive_timeout, '10'
 
     # Nginx ssl settings
     set :nginx_use_ssl, false
@@ -28,7 +30,8 @@ namespace :load do
     set :nginx_ssl_session_cache, 'shared:SSL:10m'
 
     # Nginx caching settings
-    set :cache_static_files, true
+    set :cache_all_static_files, false
+    set :cache_assets_folder, true
     set :cache_custom, ''
     set :cache_custom_expire, 'max'
 
@@ -68,6 +71,12 @@ namespace :load do
     set :puma_env, ''
     set :puma_app_env, -> { fetch(:rails_env) || fetch(:rack_env) || fetch(:stage) }
 
+    # Puma Worker Killer settings
+    set :puma_worker_killer_ram, 512 # mb
+    set :puma_worker_killer_frequency, 10 #seconds
+    set :puma_worker_killer_percent_usage, 0.99 # percent of RAM to use
+    set :puma_worker_killer_rolling_restart_frequency, 6*3600 # 6 hours in seconds
+
     # General Sidekiq settings
     set :sidekiq_workers, 3
     set :sidekiq_user, -> { fetch(:deploy_user) }

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

@@ -41,8 +41,8 @@ server {
 
   <%= fetch(:nginx_custom_block) %>
 
-  client_max_body_size 4G;
-  keepalive_timeout 10;
+  client_max_body_size <%= fetch(:nginx_max_body_size) %>;
+  keepalive_timeout <%= fetch(:nginx_keep_alive_timeout) %>;
 
   error_page 500 502 504 /500.html;
 
@@ -117,13 +117,20 @@ server {
   }
   <% end %>
 
-  <% if fetch(:cache_static_files) %>
+  <% if fetch(:cache_all_static_files) %>
   location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc|css|js)$ {
     expires max;
     add_header Cache-Control public;
   }
   <% end %>
 
+  <% if fetch(:cache_assets_folder) %>
+  location ~* ^/assets/ {
+    expires max;
+    add_header Cache-Control public;
+  }
+  <% end %>
+
   <% if fetch(:cache_custom).length > 0 %>
   location <%= fetch(:cache_custom) %> {
     expires <%= fetch(:cache_custom_expire) %>;

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

@@ -22,3 +22,15 @@ on_worker_boot do
     end
   end
 end
+
+before_fork do
+  if defined? PumaWorkerKiller
+    PumaWorkerKiller.config do |config|
+      config.ram           = <%= fetch(:puma_worker_killer_ram) %>
+      config.frequency     = <%= fetch(:puma_worker_killer_frequency) %>
+      config.percent_usage = <%= fetch(:puma_worker_killer_percent_usage) %>
+      config.rolling_restart_frequency = <%= fetch(:puma_worker_killer_rolling_restart_frequency) %>
+    end
+    PumaWorkerKiller.start
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-generals
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Stef Schenkelaars
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Some general capistrano tasks which are commonly used