magic_recipes_two 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 5c2b0b7af1195077f81b90071dc367159587c9eb
-  data.tar.gz: c887513e209a140402efe284a79dc72cd524be4d
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MWVhMzk1NzEzYTA3NTMyYzZhNzk4NjhhMjVkNjA5MTVjODY0MzRjMg==
+  data.tar.gz: !binary |-
+    YzExOTY3MDAzYWNkZTM2Y2I4NjE2MjQyYzc4MWI1ZjhlYTQ5MTIxMg==
 SHA512:
-  metadata.gz: 17954f6767dec62c65fc1203be036fdbdf70d7856416f1a410514d8d3988b865628a09b9e05eb427ea8f1605444a2212f765b8a84b92b44ada9f35f96ce23f2d
-  data.tar.gz: c4a8dae99745d9ad2b790a0343bbf938fdbc82d5923ef2bae39eb3fd310688b938198fef2a3595486f055e47db4a9ee754ce7425f2f2226bdb8b10d59333451d
+  metadata.gz: !binary |-
+    NDUwYWM0NzE2MWUxZWNlMjMzMTBiODRiOTYxM2JkN2Q3MmYxYzgxMGZhMGRh
+    NzU4Yjc5YzllYzlkODg3NWJkYmJkZmFmNGY0ZmUyZmI2ODNjNzI3NDQwN2Yx
+    M2Q1MmRjZGQxNzA0MWM3ODM2NjUyMjMxMzZlMzBjZjg4NjRkOTU=
+  data.tar.gz: !binary |-
+    ZTk1NjNmYmE4MmMzNGExYjg5OTg2N2Q1ZTFlY2Q2Y2M3Yjk5M2ExZjY2Mjk2
+    OTRiYmZjODE2NjFlZDY3ZTE3ZDVmNmM0MGY1YzA3MTc2OGI4MGYwNjZkZWQx
+    MWFhNjZkMzA3OTIwODg1OWRhY2NlZjNkNDc4YjcxZjUxNGI2ZTY=

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.30"
+    VERSION = "0.0.31"
   end
 end

data/lib/capistrano/tasks/monit.rake

@@ -6,9 +6,14 @@ namespace :load do
     set :monit_roles,                 -> { :web }
     set :monit_interval,              -> { 30 }
     set :monit_bin,                   -> { '/usr/bin/monit' }
-    set :monit_logfile,               -> { '/var/log/monit.log' }
+    ## Monit default:                 '/var/log/monit.log'
+    set :monit_logfile,               -> { "#{shared_path}/log/monit.log" }
     set :monit_idfile,                -> { '/var/lib/monit/id' }
     set :monit_statefile,             -> { '/var/lib/monit/state' }
+    ## Status
+    set :monit_active,                -> { true }
+    # set :monit_processes,             -> { %w[nginx postgresql redis sidekiq thin] }
+    set :monit_processes,             -> { %w[nginx postgresql thin] }
     ## Mailer
     set :monit_mail_server,           -> { "smtp.gmail.com" }
     set :monit_mail_port,             -> { 587 }
@@ -56,9 +61,8 @@ namespace :monit do
       # invoke "monit:redis"
       # invoke "monit:thin"
       # invoke "monit:configure_website"
-      
       %w[nginx postgresql redis sidekiq thin].each do |command|
-        invoke "monit:configure_#{command}"
+        invoke "monit:configure_#{command}" if Array(fetch(:monit_processes)).include?(command)
       end
     end
     invoke "monit:syntax"
@@ -66,79 +70,50 @@ namespace :monit do
   end
   # after "deploy:setup", "monit:setup"
   
-  # task(:nginx, roles: :web) { monit_config "nginx" }
-  # task(:postgresql, roles: :db) { monit_config "postgresql" }
-  # task(:unicorn, roles: :app) { monit_config "unicorn" }
-  
-  ## Server specific tasks (gets overwritten by other environments!)
-  
   
   %w[nginx postgresql redis sidekiq thin].each do |process|
-  
-    %w[monitor unmonitor start stop restart].each do |command|
-      desc "#{command} monit-service for: #{process}"
-      task "#{command}_#{process}" do
-        on roles(fetch(:sidekiq_roles)) do
-          if process == "sidekiq"
-            fetch(:sidekiq_processes).times do |idx|
-              sudo "#{fetch(:monit_bin)} #{command} #{sidekiq_service_name(idx)}"
-            end
-          elsif process == "thin"
-            fetch(:app_instances).times do |idx|
-              sudo "#{fetch(:monit_bin)} #{command} #{fetch(:application)}_#{fetch(:stage)}_thin_#{idx}"
+    if Array(fetch(:monit_processes)).include?(process)
+      
+      %w[monitor unmonitor start stop restart].each do |command|
+        desc "#{command} monit-service for: #{process}"
+        task "#{command}_#{process}" do
+          on roles(fetch(:sidekiq_roles)) do
+            if process == "sidekiq"
+              fetch(:sidekiq_processes).times do |idx|
+                sudo "#{fetch(:monit_bin)} #{command} #{sidekiq_service_name(idx)}"
+              end
+            elsif process == "thin"
+              fetch(:app_instances).times do |idx|
+                sudo "#{fetch(:monit_bin)} #{command} #{fetch(:application)}_#{fetch(:stage)}_thin_#{idx}"
+              end
+            else
+              sudo "#{fetch(:monit_bin)} #{command} #{process}"
             end
-          else
-            sudo "#{fetch(:monit_bin)} #{command} #{process}"
           end
         end
       end
-    end
-    
-    if %w[nginx postgresql redis].include?(process)
-      ## Server specific tasks (gets overwritten by other environments!)
-      desc "Upload Monit #{process} config file (server specific)"
-      task "configure_#{process}" do
-        on release_roles fetch("#{process}_roles".to_sym) do |role|
-          monit_config( process, nil, role )
+      
+      if %w[nginx postgresql redis].include?(process)
+        ## Server specific tasks (gets overwritten by other environments!)
+        desc "Upload Monit #{process} config file (server specific)"
+        task "configure_#{process}" do
+          on release_roles fetch("#{process}_roles".to_sym) do |role|
+            monit_config( process, nil, role )
+          end
         end
-      end
-    elsif %w[sidekiq thin].include?(process)
-      ## App specific tasks (unique for app and environment)
-      desc "Upload Monit #{process} config file (app specific)"
-      task "configure_#{process}" do
-        on release_roles fetch("#{process}_roles".to_sym) do |role|
-          monit_config process, "/etc/monit/conf.d/#{fetch(:application)}_#{fetch(:stage)}_#{process}.conf", role
+      elsif %w[sidekiq thin].include?(process)
+        ## App specific tasks (unique for app and environment)
+        desc "Upload Monit #{process} config file (app specific)"
+        task "configure_#{process}" do
+          on release_roles fetch("#{process}_roles".to_sym) do |role|
+            monit_config process, "/etc/monit/conf.d/#{fetch(:application)}_#{fetch(:stage)}_#{process}.conf", role
+          end
         end
       end
+      
     end
-    
   end
   
-  # => desc "Upload Monit website config file (server specific)"
-  # => task :configure_website do
-  # =>   on release_roles :web do |role|
-  # =>     monit_config( "website", nil, role )
-  # =>   end
-  # => end
-  
-  # => %w[nginx postgresql redis].each do |command|
-  # =>   desc "Upload Monit #{command} config file (server specific)"
-  # =>   task command do
-  # =>     on release_roles fetch("#{command}_roles".to_sym) do |role|
-  # =>       monit_config( command, nil, role )
-  # =>     end
-  # =>   end
-  # => end
-  # => 
-  # => ## App specific tasks (unique for app and environment)
-  # => %w[sidekiq thin].each do |command|
-  # =>   desc "Upload Monit #{command} config file (app specific)"
-  # =>   task command do
-  # =>     on release_roles fetch("#{command}_roles".to_sym) do |role|
-  # =>       monit_config command, "/etc/monit/conf.d/#{fetch(:application)}_#{fetch(:stage)}_#{command}.conf", role
-  # =>     end
-  # =>   end
-  # => end
 
   %w[start stop restart syntax reload].each do |command|
     desc "Run Monit #{command} script"
@@ -159,12 +134,6 @@ def monit_config( name, destination = nil, role = nil )
   @role = role
   destination ||= "/etc/monit/conf.d/#{name}.conf"
   template_with_role "monit/#{name}", "/tmp/monit_#{name}", @role
-  # erb = File.read(File.expand_path("../../../../config/deploy/templates/monit/#{name}.erb", __FILE__))
-  # config = ERB.new(erb).result(binding)
-  # upload! StringIO.new(config), "/tmp/monit_#{name}"
-  # run "#{sudo} mv /tmp/monit_#{name} #{destination}"
-  # run "#{sudo} chown root #{destination}"
-  # run "#{sudo} chmod 600 #{destination}"
   execute :sudo, "mv /tmp/monit_#{name} #{destination}"
   execute :sudo, "chown root #{destination}"
   execute :sudo, "chmod 600 #{destination}"
@@ -174,12 +143,19 @@ end
 namespace :deploy do
   before :starting, :stop_monitoring do
     %w[sidekiq thin].each do |command|
-      invoke "monit:unmonitor_#{command}"
+      if fetch(:monit_active) && Array(fetch(:monit_processes)).include?(command)
+        invoke "monit:unmonitor_#{command}"
+      end
     end
   end
   after :finished, :restart_monitoring do
     %w[sidekiq thin].each do |command|
-      invoke "monit:monitor_#{command}"
+      if fetch(:monit_active) && Array(fetch(:monit_processes)).include?(command)
+        invoke "monit:monitor_#{command}"
+      end
     end
   end
+  after :finished, :setup_monit_configs do
+    invoke "monit:setup" if fetch(:monit_active)
+  end
 end

data/lib/capistrano/tasks/nginx.rake

@@ -24,6 +24,7 @@ namespace :load do
     set :nginx_ssl_certificate_key,   -> { "#{fetch(:application)}.crt" }
     set :nginx_ssl_certificate_key_path, -> { '/etc/ssl/private' }
     set :app_server_ip,               -> { "127.0.0.1" }
+    set :nginx_hooks,                 -> { true }
     ## NginX Proxy-Caching
     # Cache Rails
     set :proxy_cache_rails,           -> { false }
@@ -83,15 +84,10 @@ namespace :nginx do
         within fetch(:sites_available) do
           config_file = fetch(:nginx_template)
           if config_file == :default
-            # config_file = File.expand_path("../../../../config/deploy/templates/nginx.conf.erb", __FILE__)
             magic_template("nginx.conf", '/tmp/nginx.conf')
           else
             template(config_file, '/tmp/nginx.conf')
           end
-          # config = ERB.new(File.read(config_file)).result(binding)
-          # upload! StringIO.new(config), '/tmp/nginx.conf'
-          
-
           execute :sudo, :mv, '/tmp/nginx.conf', "#{fetch(:application)}_#{fetch(:stage)}"
         end
       end
@@ -134,10 +130,12 @@ end
 
 
 namespace :deploy do
-  after 'deploy:finished', :restart_nginx_app do
-    invoke "nginx:site:add"
-    invoke "nginx:site:enable"
-    invoke "nginx:restart"
+  after 'deploy:finishing', :restart_nginx_app do
+    if fetch(:nginx_hooks)
+      invoke "nginx:site:add"
+      invoke "nginx:site:enable"
+      invoke "nginx:restart"
+    end
   end
 end
 

data/lib/capistrano/tasks/secrets.rake

@@ -9,6 +9,7 @@ namespace :load do
     set :secrets_key_name,    -> { "#{ fetch(:application) }_#{ fetch(:stage) }_SECRET_KEY_BASE".gsub(/-/, "_").gsub(/[^a-zA-Z_]/, "").upcase }
     set :secrets_user_path,   -> { "/home/#{fetch(:user)}" }
     set :secrets_set_both,    -> { false }
+    set :secrets_hooks,       -> { true }
   end
 end
 
@@ -79,4 +80,12 @@ namespace :secrets do
   after 'deploy:started', 'secrets:secrets_yml_symlink'
   
   
-end
+end
+
+
+
+
+desc 'Server setup tasks'
+task :setup do
+  invoke "secrets:setup" if fetch(:secrets_hooks)
+end

data/lib/capistrano/tasks/thin.rake

@@ -13,6 +13,7 @@ namespace :load do
     set :thin_require,                -> { [] }
     set :thin_wait,                   -> { 90 }
     set :thin_onebyone,               -> { true }
+    set :thin_hooks,                  -> { true }
     
   end
 end
@@ -58,9 +59,11 @@ end
 
 
 namespace :deploy do
-  before 'deploy:finished', :restart_thin_apps do
-    invoke "thin:reconf"
-    invoke "thin:restart"
+  after 'deploy:published', :restart_thin_apps do
+    if fetch(:thin_hooks)
+      invoke "thin:reconf"
+      invoke "thin:restart"
+    end
   end
 end
 

data/lib/generators/capistrano/magic_recipes/templates/monit/nginx.erb

@@ -2,6 +2,7 @@
 check process nginx with pidfile /var/run/nginx.pid
   start program = "/etc/init.d/nginx start"
   stop program = "/etc/init.d/nginx stop"
+  if does not exist then alert
   if children > 250 then restart
   if failed host 127.0.0.1 port 80 then restart
   if cpu is greater than 40% for 2 cycles then alert

data/lib/generators/capistrano/magic_recipes/templates/monit/postgresql.erb

@@ -2,5 +2,6 @@
 check process postgresql with pidfile <%= fetch(:postgresql_pid) %>
   start program = "/etc/init.d/postgresql start"
   stop program = "/etc/init.d/postgresql stop"
+  if does not exist then alert
   if failed host localhost port 5432 protocol pgsql then restart
   if 5 restarts within 5 cycles then timeout

data/lib/generators/capistrano/magic_recipes/templates/monit/redis.erb

@@ -2,6 +2,7 @@
 check process redis with pidfile <%= fetch(:redis_pid) %>
     start program = "/etc/init.d/redis-server start"
     stop program = "/etc/init.d/redis-server stop"
+    if does not exist then alert
     if 2 restarts within 3 cycles then timeout
     if totalmem > 100 Mb then alert
     if children > 255 for 5 cycles then stop

data/lib/generators/capistrano/magic_recipes/templates/monit/sidekiq.erb

@@ -22,6 +22,7 @@ check process <%= sidekiq_service_name(idx) %>
   start program = "/bin/su - <%= @role.user %> -c 'cd <%= current_path %> ; bundle exec sidekiq <%= args.join(" ") %>'" with timeout 30 seconds
   stop program = "/bin/su - <%= @role.user %> -c 'cd <%= current_path %> ; bundle exec sidekiqctl stop <%= pid_file %>' " with timeout <%= fetch(:sidekiq_timeout).to_i + 10  %> seconds
   group <%= fetch(:sidekiq_monit_group, fetch(:application)) %>-sidekiq
+  if does not exist then alert
   if totalmem is greater than 200 MB for 2 cycles then restart
   if 3 restarts within 5 cycles then timeout
   alert <%= fetch(:monit_mail_to) %> only on { pid }

data/lib/generators/capistrano/magic_recipes/templates/monit/thin.erb

@@ -5,6 +5,7 @@
     group thin-<%= fetch(:stage) %>
     start program = "/bin/su - <%= @role.user %> -c 'cd <%= current_path %> ;<% if fetch(:monit_thin_with_secret) %> export SECRET_KEY_BASE=<%= fetch(:secrets_key_base) %>; export <%= fetch(:secrets_key_name) %>=<%= fetch(:secrets_key_base) %>;<% end %> bundle exec thin start -C config/thin_app_<%= fetch(:stage) %>.yml -o <%= n %>' "
     stop program = "/bin/su - <%= @role.user %> -c 'cd <%= current_path %> ; bundle exec thin stop -C config/thin_app_<%= fetch(:stage) %>.yml -o <%= n %>' " 
+    if does not exist then alert
     if mem > 200.0 MB for 1 cycles then restart
     if cpu > 50% for 3 cycles then restart
     if 5 restarts within 5 cycles then timeout

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - Torsten Wetzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: capistrano-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: capistrano-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
@@ -84,28 +84,28 @@ dependencies:
   name: capistrano-postgresql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: MagicRecipesTwo contains our most used deployment recipes for Capistrano-3.
@@ -165,17 +165,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Some recipes for rails-4 and capistrano-3.