magic_recipes_two 0.0.88 → 0.0.89

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: d5afa5a73635e41301b8c286d80b74762150856c
-  data.tar.gz: 04ac0c0a0d212570255ffc8efae3be6c3f897a9a
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDU0YmVhOTliMDEwNzNmZWY0NTU1OWM0YTRlNjhhYzliMWI4YmZlMg==
+  data.tar.gz: !binary |-
+    NmE5YzA4MDZkODAxMTE4YWU2MTAzOTQwN2JhM2I0YTRhMmRhZDA0Yg==
 SHA512:
-  metadata.gz: 27a51b90076883270754e6cd85f5732c08f1a8d1661ddad309a42a8ef6e00075af505fc4aeffa9a34cbc2f268fc310eb7d13b4e3c64e07b7789fc518eb398351
-  data.tar.gz: 5f453d441016d6ea32116aa67a42f20857d4c6624e591df60a75cc16119e63a5644e791be46605daf3c570d676512a1c1ab96628134c2eb0e9ef3f2a6ac746ca
+  metadata.gz: !binary |-
+    MzMwYWVmMzQzMTNjZjBlNzkxNTc2MmExMGQ5OTA3ZGE4MThmNTc3MDA4YmJl
+    N2UyNDBjMjRlMTkzNGMyNjk3YzExMmU3N2RlYmFiOWFjMGUxZmY3NDg5YmEy
+    YmE0NTNkNmE4MTdlZmZmMzc4Y2NkYjczODY0NzZkMGVjMTBiODg=
+  data.tar.gz: !binary |-
+    YWM2NjFmZDU2NjIxMzcyNTE1MDU3ODM5YmQxM2QxNzEwNTI3ZTgxMDU3NDY3
+    NTFjY2Q5MTkwZTQyYjA1ZWYxYjM5NjEyY2FjN2Q5MWIyYTdlZTZkYzA4NGQ5
+    YjIxYWRlN2I4YmFkMjdkZGJlMTYwODRjNGJlNGJiM2Y5NjIxN2M=

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.88"
+    VERSION = "0.0.89"
   end
 end

data/lib/capistrano/tasks/monit.rake

@@ -13,7 +13,8 @@ namespace :load do
     set :monit_downgrade_on_deploy,   -> { false }
     ## Status
     set :monit_active,                -> { true }
-    # set :monit_processes,             -> { %w[nginx postgresql redis sidekiq thin website] }
+    set :monit_main_rc,               -> { true }
+    # set :monit_processes,             -> { %w[nginx pm2 postgresql pwa redis sidekiq thin website] }
     set :monit_processes,             -> { %w[nginx postgresql thin website] }
     set :monit_name,                  -> { "#{ fetch(:application) }_#{ fetch(:stage) }" }
     ## Mailer
@@ -47,6 +48,13 @@ namespace :load do
     set :monit_http_pemfile,          -> { "/etc/monit/monit.pem" }
     set :monit_http_username,         -> { "admin" }
     set :monit_http_password,         -> { "monitor" }
+    # use a subdomain for monit?
+    set :monit_webclient,             -> { false }
+    set :monit_webclient_domain,      -> { false }
+    set :monit_webclient_use_ssl,     -> { false }
+    set :monit_webclient_ssl_cert,    -> { false }
+    set :monit_webclient_ssl_key,     -> { false }
+    set :monit_nginx_template,        -> { :default }
     ## Website
     set :monit_website_check_timeout, -> { 10 }
     set :monit_website_check_cycles,  -> { 3 }
@@ -56,6 +64,20 @@ namespace :load do
     ## M/Monit
     set :monit_mmonit_url,            -> { false }
     
+    ## PM2 - JS - App
+    set :monit_pm2_app_name,          -> { "app" }
+    set :monit_pm2_app_instances,     -> { 1 }
+    set :monit_pm2_app_path,          -> { "/home/#{fetch(:user)}/pm2_app" }
+    set :monit_pm2_pid_path,          -> { "/home/#{fetch(:user)}/.pm2/pids" }
+    set :monit_pm2_start_script,      -> { "ecosystem.config.js" }
+    set :monit_pm2_stage,             -> { "production" }
+    set :monit_pm2_website,           -> { "example.com" }
+    set :monit_pm2_website_ssl,       -> { false }
+    set :pm2_roles,                   -> { :web }
+    set :monit_pm2_worker_role,       -> { :user }
+    set :monit_pm2_worker_prefix,     -> { "" }
+    
+    
   end
 end
 
@@ -72,16 +94,22 @@ namespace :monit do
   desc "Setup all Monit configuration"
   task :setup do
     on release_roles fetch(:monit_roles) do
-      monit_config "monitrc", "/etc/monit/monitrc"
+      if fetch(:monit_main_rc, false)
+        monit_config "monitrc", "/etc/monit/monitrc"
+      end
       # invoke "monit:nginx"
       # invoke "monit:postgresql"
       # invoke "monit:sidekiq"
       # invoke "monit:redis"
       # invoke "monit:thin"
       # invoke "monit:configure_website"
-      %w[nginx postgresql redis sidekiq thin website].each do |command|
+      %w[nginx pm2 postgresql redis sidekiq thin website].each do |command|
         invoke "monit:configure_#{command}" if Array(fetch(:monit_processes)).include?(command)
       end
+      if fetch(:monit_webclient, false) && fetch(:monit_webclient_domain, false)
+        invoke "nginx:monit:add"
+        invoke "nginx:monit:enable"
+      end
     end
     invoke "monit:syntax"
     invoke "monit:reload"
@@ -95,7 +123,7 @@ namespace :monit do
     end
   end
   
-  %w[nginx postgresql redis sidekiq thin].each do |process|
+  %w[nginx pm2 postgresql redis sidekiq thin].each do |process|
       
       %w[monitor unmonitor start stop restart].each do |command|
         desc "#{command} monit-service for: #{process}"
@@ -111,6 +139,10 @@ namespace :monit do
                 fetch(:app_instances).times do |idx|
                   sudo "#{fetch(:monit_bin)} #{command} #{fetch(:application)}_#{fetch(:stage)}_thin_#{idx}"
                 end
+              elsif process == "pm2"
+                fetch(:monit_pm2_app_instances).times do |idx|
+                  sudo "#{fetch(:monit_bin)} #{command} #{fetch(:application)}_#{fetch(:stage)}_pm2_#{idx}"
+                end
               else
                 sudo "#{fetch(:monit_bin)} #{command} #{process}"
               end
@@ -129,7 +161,7 @@ namespace :monit do
             end
           end
         end
-      elsif %w[sidekiq thin].include?(process)
+      elsif %w[pm2 pwa sidekiq thin].include?(process)
         ## App specific tasks (unique for app and environment)
         desc "Upload Monit #{process} config file (app specific)"
         task "configure_#{process}" do
@@ -178,17 +210,20 @@ def monit_config( name, destination = nil, role = nil )
   execute :sudo, "chmod 600 #{destination}"
 end
 
-def monit_app_prefixed( cmd )
-  # fetch(:monit_app_worker_command, "cd #{ current_path } ; bundle exec MONIT_CMD").to_s.gsub(/MONIT_CMD/, cmd)
-  
-  case fetch(:monit_app_worker_role, :user).to_s.downcase.strip
+def monit_role_prefix( role )
+  case role.to_s.downcase.strip
   when "sh", "shell"
-    komando = "/bin/sh -c 'COMMAND_PREFIX bundle exec MONIT_CMD'"
+    "/bin/sh -c 'REAL_COMMAND_HERE'"
   when "bash"
-    komando = "/bin/bash -c 'REAL_COMMAND_HERE'"
+    "/bin/bash -c 'REAL_COMMAND_HERE'"
   else
-    komando = "/bin/su - #{role.user} -c 'REAL_COMMAND_HERE'"
+    "/bin/su - #{fetch(:user)} -c 'REAL_COMMAND_HERE'"
   end
+end
+
+def monit_app_prefixed( cmd )
+  # fetch(:monit_app_worker_command, "cd #{ current_path } ; bundle exec MONIT_CMD").to_s.gsub(/MONIT_CMD/, cmd)
+  komando = monit_role_prefix( fetch(:monit_app_worker_role, :user) )
   
   case fetch(:monit_app_worker_prefix, :env).to_s.downcase.strip
   when "rvm"
@@ -200,6 +235,68 @@ def monit_app_prefixed( cmd )
   end
   
   komando.gsub(/MONIT_CMD/, cmd)
+end
+
+def monit_pm2_prefixed( cmd )
+  # fetch(:monit_app_worker_command, "cd #{ current_path } ; bundle exec MONIT_CMD").to_s.gsub(/MONIT_CMD/, cmd)
+  komando = monit_role_prefix( fetch(:monit_pm2_worker_role, :user) )
+  komando.gsub!(/REAL_COMMAND_HERE/, "cd #{fetch(:monit_pm2_app_path)} ; #{fetch(:monit_pm2_worker_prefix, '')} MONIT_CMD")
+  komando.gsub(/MONIT_CMD/, cmd)
+end
+
+
+
+namespace :nginx do
+  namespace :monit do
+    
+    desc 'Creates MONIT WebClient configuration and upload it to the available folder'
+    task :add => ['nginx:load_vars'] do
+      on release_roles fetch(:nginx_roles) do
+        within fetch(:sites_available) do
+          config_file = fetch(:monit_nginx_template, :default)
+          if config_file == :default
+            magic_template("nginx_monit.conf", '/tmp/nginx_monit.conf')
+          else
+            magic_template(config_file, '/tmp/nginx_monit.conf')
+          end
+          execute :sudo, :mv, '/tmp/nginx_monit.conf', "monit_webclient"
+        end
+      end
+    end
+    
+    desc 'Enables MONIT WebClient creating a symbolic link into the enabled folder'
+    task :enable => ['nginx:load_vars'] do
+      on release_roles fetch(:nginx_roles) do
+        if test "! [ -h #{ File.join(fetch(:sites_enabled), "monit_webclient") } ]"
+          within fetch(:sites_enabled) do
+            execute :sudo, :ln, '-nfs', File.join(fetch(:sites_available), "monit_webclient"), "monit_webclient"
+          end
+        end
+      end
+    end
+
+    desc 'Disables MONIT WebClient removing the symbolic link located in the enabled folder'
+    task :disable => ['nginx:load_vars'] do
+      on release_roles fetch(:nginx_roles) do
+        if test "[ -f #{ File.join(fetch(:sites_enabled), "monit_webclient") } ]"
+          within fetch(:sites_enabled) do
+            execute :sudo, :rm, '-f', "monit_webclient"
+          end
+        end
+      end
+    end
+    
+  end
+end
+
+namespace :lets_encrypt do
+  
+  desc "Generate MONIT-WebClient LetsEncrypt certificate"
+  task :monit_certonly do
+    on release_roles fetch(:lets_encrypt_roles) do
+      execute :sudo, "#{ fetch(:lets_encrypt_path) }/certbot-auto --non-interactive --agree-tos --email #{fetch(:lets_encrypt_email)} certonly --webroot -w #{current_path}/public -d #{ fetch(:monit_webclient_domain).gsub(/^\*?\./, '') }"
+    end
+  end
   
 end
 
@@ -216,6 +313,12 @@ namespace :deploy do
   # after :finished, :setup_monit_configs do
   #   invoke "monit:setup" if fetch(:monit_active)
   # end
+  before 'deploy:finishing', :add_monit_webclient do
+    if fetch(:monit_webclient, false) && fetch(:monit_webclient_domain, false)
+      invoke "nginx:monit:add"
+      invoke "nginx:monit:enable"
+    end
+  end
   after :finished, :restart_monitoring do
     %w[sidekiq thin].each do |command|
       if fetch(:monit_active) && Array(fetch(:monit_processes)).include?(command)

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

@@ -0,0 +1,32 @@
+# Monit configuration for PM2 :  <%= fetch(:application) %>  (<%= fetch(:stage) %>)
+<%  fetch(:monit_pm2_app_instances, 1).times do |n| %>
+  check process <%= fetch(:application) %>_<%= fetch(:stage) %>_pm2_<%= n %> with pidfile <%= fetch(:monit_pm2_pid_path) %>/<%= fetch(:monit_pm2_app_name) %>-<%= n %>.pid
+    group pm2-<%= fetch(:application) %>-<%= fetch(:stage) %>
+    start program = "<%= monit_pm2_prefixed("pm2 restart #{fetch(:monit_pm2_start_script)} --env #{fetch(:monit_pm2_stage)}") %>"
+    stop program = "<%= monit_pm2_prefixed("pm2 stop #{fetch(:monit_pm2_start_script)} --env #{fetch(:monit_pm2_stage)}") %>"
+    # if does not exist then start # (default)
+    if does not exist for 3 cycles then alert
+    # if 3 restarts within 10 cycles then alert
+    # if cpu > 50% then alert
+    # if cpu > 50% for 3 cycles then restart
+    # if 5 restarts within 15 cycles then timeout
+    # alert <%= fetch(:monit_mail_to) %> only on { pid }
+    if changed pid 3 times within 10 cycles then alert
+<% end %>
+
+
+
+# Check website for pm2: <%= fetch(:application) %> [<%= fetch(:stage) %>]
+check host <%= fetch(:monit_pm2_website) %> with address <%= fetch(:monit_pm2_website) %>
+  if failed 
+  <% if fetch(:monit_pm2_website_ssl) %>
+    port 443
+    type TCPSSL
+    protocol https
+  <% else %>
+    port 80
+    protocol http
+  <% end %>
+    # status = 200
+    with timeout 13 seconds for 5 cycles 
+  then alert

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

@@ -0,0 +1,23 @@
+<% if fetch(:pwa_major_domain, false) %>
+  <% domain_list = [fetch(:pwa_major_domain, "").to_s.gsub(/^\*?\./, "")] %>
+<% else %>
+  <% domain_list = [] %>
+  <% Array(fetch(:pwa_domains)).each do |domain| %>
+    <% domain_list << domain.gsub(/^\*?\./, "") %>
+  <% end %>
+<% end %>
+# Check PWA domains for <%= fetch(:application) %> [<%= fetch(:stage) %>]
+<% domain_list.uniq.each do |domain| %>
+check host <%= domain %> with address <%= domain %>
+  if failed 
+  <% if fetch(:pwa_use_ssl) %>
+    port 443
+    type TCPSSL
+    protocol https
+  <% else %>
+    port 80
+    protocol http
+  <% end %>
+    with timeout 13 seconds for 5 cycles 
+  then alert
+<% end %>

data/lib/generators/capistrano/magic_recipes/templates/nginx_monit.conf.erb

@@ -0,0 +1,38 @@
+# Monit - WebInterface
+<% if fetch(:monit_webclient_use_ssl, false) %>
+server {
+  listen                80;
+  server_name           <%= fetch(:monit_webclient_domain) %>;
+  return 301 https://$host$request_uri;
+}
+<% end %>
+
+
+
+server {
+<% if fetch(:monit_webclient_use_ssl) %>
+  listen                443 ssl http2;
+  #listen                [::]:443 ssl http2;
+  ssl                   on;
+  ssl_certificate       <%= fetch(:monit_webclient_ssl_cert) %>;
+  ssl_certificate_key   <%= fetch(:monit_webclient_ssl_key) %>;
+  <%= magic_render("nginx/diffie_hellman") %>
+<% else %>
+  listen                80;
+  listen                [::]:80;
+<% end %>
+  
+  server_name           <%= fetch(:monit_webclient_domain) %>;
+  
+  location ^~ /.well-known/ {
+    allow         all;
+    # root          /tmp/monit/well_known;
+    root          <%= current_path %>/public;
+  }
+  location / {
+      proxy_set_header   X-Real-IP $remote_addr;
+      proxy_set_header   Host      $http_host;
+      proxy_pass         http://127.0.0.1:2812;
+  }
+  
+}

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.88
+  version: 0.0.89
 platform: ruby
 authors:
 - Torsten Wetzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-08-16 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
   name: rvm1-capistrano3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: capistrano-rvm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
   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: yaml_db
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !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.
@@ -179,7 +179,9 @@ files:
 - lib/generators/capistrano/magic_recipes/templates/monit/monitrc.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/nginx.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/nginx_conf.erb
+- lib/generators/capistrano/magic_recipes/templates/monit/pm2.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/postgresql.erb
+- lib/generators/capistrano/magic_recipes/templates/monit/pwa.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/redis.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/sidekiq.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/thin.erb
@@ -191,6 +193,7 @@ files:
 - lib/generators/capistrano/magic_recipes/templates/nginx/rails_cache_path.erb
 - lib/generators/capistrano/magic_recipes/templates/nginx/rails_cache_server.erb
 - lib/generators/capistrano/magic_recipes/templates/nginx/remove_www.erb
+- lib/generators/capistrano/magic_recipes/templates/nginx_monit.conf.erb
 - lib/generators/capistrano/magic_recipes/templates/nginx_pwa.conf.erb
 - lib/generators/capistrano/magic_recipes/templates/postgresql.yml.erb
 - lib/generators/capistrano/magic_recipes/templates/secrets_yml.erb
@@ -207,17 +210,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.6.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Some recipes for rails-4 and capistrano-3.