magic_recipes_two 0.0.91 → 0.0.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 472f4e4b04b65e63711b84778706b6fe4fb3a282
-  data.tar.gz: 1b5be2fecaee6c9d3f8d7fca3653cce5f1ff8ad7
+SHA256:
+  metadata.gz: de82290a078d6de6dd0db27958456070b1cb88ef998c46bd84472743bf252983
+  data.tar.gz: c326693d2f0a94bb3ec60c5d3abd47ebc2ae63f9179186511322bf4931e4f1e0
 SHA512:
-  metadata.gz: 647bf58972384b14fda093ad39c70b5b4164647268da67769cb1312509d5804b5e60a60652f12e0f4df9aebc7d667d2ce92841cfaedf384d7c1c3a2302750014
-  data.tar.gz: b46a257c14e9f8fd51c90be613b9bbab50e53a825f5330e4bcc50b926434f71b7800dcd67f2e5ea834038912922976e54d0564bd8ff3afd7773688de7e707289
+  metadata.gz: 8de6f633599241a991d78fc9741b4a0829f1accfb43357002332ec9c497a2aba8a24871f77a36a145b53678217748bf9b2af06017b295b59176064c072d0373a
+  data.tar.gz: 3caf010043617bb8cdf99332bf12d6e3da066875042b53d061c182c9740ae1fa9df75d1eb32a776810bd7a1f76e7cb4fc7c3215e0889efec90d5af20733ddb6b

data/lib/capistrano/magic_recipes/backup.rb

@@ -0,0 +1 @@
+load File.expand_path("../../tasks/backup.rake", __FILE__)

data/lib/capistrano/magic_recipes/sidekiq_six.rb

@@ -0,0 +1 @@
+load File.expand_path("../../tasks/sidekiq_six.rake", __FILE__)

data/lib/capistrano/magic_recipes/thin_sysd.rb

@@ -0,0 +1 @@
+load File.expand_path("../../tasks/thin_sysd.rake", __FILE__)

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.91"
+    VERSION = "0.0.93"
   end
 end

data/lib/capistrano/tasks/backup.rake

@@ -0,0 +1,38 @@
+require 'capistrano/magic_recipes/base_helpers'
+include Capistrano::MagicRecipes::BaseHelpers
+
+
+namespace :load do
+  task :defaults do
+    
+    set :backup_attachment_roles,       -> { :web }
+    set :backup_attachment_name,        -> { 'dragonfly' }
+    set :backup_attachment_remote_path, -> { "#{host.user}@#{host.hostname}:#{shared_path}/public/system/dragonfly/live" }
+    set :backup_attachment_local_path,  -> { "backups/#{ fetch(:backup_attachment_name) }/#{ fetch(:stage) }" }
+    
+  end
+end
+
+
+
+namespace :backup do
+
+  desc "download attachment files from server"
+  task :get_attachments do
+    on roles fetch(:backup_attachment_roles) do
+      run_locally do
+        execute :mkdir, "-p #{fetch(:backup_attachment_local_path)}"
+      end
+      run_locally { execute "rsync -av --delete #{ fetch(:backup_attachment_remote_path) }/ #{ fetch(:backup_attachment_local_path) }" }
+    end
+  end
+
+  desc "upload attachment files from local machine"
+  task :push_attachment do
+    on roles fetch(:backup_attachment_roles) do
+      run_locally { execute "rsync -av --delete #{ fetch(:backup_attachment_local_path) }/ #{ fetch(:backup_attachment_remote_path) }" }
+    end
+  end
+
+
+end

data/lib/capistrano/tasks/db.rake

@@ -34,6 +34,35 @@ namespace :db do
     end
   end
   
+  
+  desc "upload data.yml to server and load it = DELETES EXISTING DATA"
+  task :upload_and_replace_data do
+    on roles fetch(:db_roles) do
+      puts()
+      puts()
+      puts("   ! ! !     C A U T I O N !     ! ! ! ")
+      puts()
+      puts()
+      puts("This will upload 'local-App/db/data.yml' and load it in current DB")
+      puts()
+      puts("This will   DELETE ALL DATA   in your #{ fetch(:stage) } DB!!")
+      puts()
+      ask(:are_you_sure, 'no')
+      if fetch(:are_you_sure, 'no').to_s.downcase == 'yes'
+        local_dir = "./db/data.yml"
+        remote_dir = "#{host.user}@#{host.hostname}:#{release_path}/db/data.yml"
+        puts(".. uploading db/data.yml")
+        run_locally { execute "rsync -av --delete #{local_dir} #{remote_dir}" }
+        puts(".. loading data.yml in #{ fetch(:stage) } DB")
+        within release_path do
+          execute :bundle, :exec, :rake, "db:data:load RAILS_ENV=#{fetch(:stage)}"
+        end
+      else
+        puts(".. stoped process ..")
+      end
+    end
+  end
+  
 end
 
 namespace :deploy do

data/lib/capistrano/tasks/lets_encrypt.rake

@@ -14,6 +14,7 @@ namespace :load do
     # set :lets_encrypt_renew_hour,   -> { "3" }
     set :lets_encrypt_cron_log,     -> { "#{shared_path}/log/lets_encrypt_cron.log" }
     set :lets_encrypt_email,        -> { "ssl@example.com" }
+    set :lets_encrypt_client,       -> { "certbot-auto" }   # "new: certbot" / "certbot-auto"
   end
 end
 
@@ -23,8 +24,16 @@ namespace :lets_encrypt do
   task :install do
     on release_roles fetch(:lets_encrypt_roles) do
       within fetch(:lets_encrypt_path) do
-        execute "wget https://dl.eff.org/certbot-auto"
-        execute "chmod a+x certbot-auto"
+        if fetch(:lets_encrypt_client) == "certbot-auto"
+          execute "wget https://dl.eff.org/certbot-auto"
+          execute "chmod a+x certbot-auto"
+        else
+          execute :sudo, "snap install core"
+          execute :sudo, "snap refresh core"
+          execute :sudo, "snap install --classic certbot"
+          execute :sudo, "ln -s /snap/bin/certbot /usr/bin/certbot"
+          execute :sudo, "snap set certbot trust-plugin-with-root=ok"
+        end
       end
     end
   end
@@ -34,7 +43,11 @@ namespace :lets_encrypt do
   task :certonly do
     on release_roles fetch(:lets_encrypt_roles) do
       # execute "./certbot-auto certonly --webroot -w /var/www/example -d example.com -d www.example.com -w /var/www/thing -d thing.is -d m.thing.is"
-      execute :sudo, "#{ fetch(:lets_encrypt_path) }/certbot-auto --non-interactive --agree-tos --allow-subset-of-names --email #{fetch(:lets_encrypt_email)} certonly --webroot -w #{current_path}/public #{ Array(fetch(:lets_encrypt_domains)).map{ |d| "-d #{d.gsub(/^\*?\./, "")}#{ fetch(:lets_encrypt__www_domains,false) ? " -d www.#{d.gsub(/^\*?\./, "")}" : "" }" }.join(" ") }"
+      if fetch(:lets_encrypt_client) == "certbot-auto"
+        execute :sudo, "#{ fetch(:lets_encrypt_path) }/certbot-auto --non-interactive --agree-tos --allow-subset-of-names --email #{fetch(:lets_encrypt_email)} certonly --webroot -w #{current_path}/public #{ Array(fetch(:lets_encrypt_domains)).map{ |d| "-d #{d.gsub(/^\*?\./, "")}#{ fetch(:lets_encrypt__www_domains,false) ? " -d www.#{d.gsub(/^\*?\./, "")}" : "" }" }.join(" ") }"
+      else
+        execute :sudo, "certbot --non-interactive --agree-tos --allow-subset-of-names --email #{fetch(:lets_encrypt_email)} certonly --webroot -w #{current_path}/public #{ Array(fetch(:lets_encrypt_domains)).map{ |d| "-d #{d.gsub(/^\*?\./, "")}#{ fetch(:lets_encrypt__www_domains,false) ? " -d www.#{d.gsub(/^\*?\./, "")}" : "" }" }.join(" ") }"
+      end
     end
   end
   
@@ -46,7 +59,11 @@ namespace :lets_encrypt do
       # execute :sudo, "echo '42 0,12 * * * root (#{ fetch(:lets_encrypt_path) }/certbot-auto renew --quiet) >> #{shared_path}/lets_encrypt_cron.log 2>&1' | cat > #{ fetch(:lets_encrypt_path) }/lets_encrypt_cronjob"
       # execute :sudo, "echo '#{ fetch(:lets_encrypt_renew_minute) } #{ fetch(:lets_encrypt_renew_hour) } * * * root #{ fetch(:lets_encrypt_path) }/certbot-auto renew --no-self-upgrade --allow-subset-of-names --post-hook \"#{fetch(:nginx_service_path)} restart\"  >> #{ fetch(:lets_encrypt_cron_log) } 2>&1' | cat > #{ fetch(:lets_encrypt_path) }/lets_encrypt_cronjob"
       # just once a week
-      execute :sudo, "echo '0 0 * * 0 root #{ fetch(:lets_encrypt_path) }/certbot-auto renew --no-self-upgrade --allow-subset-of-names --post-hook \"#{fetch(:nginx_service_path)} restart\"  >> #{ fetch(:lets_encrypt_cron_log) } 2>&1' | cat > #{ fetch(:lets_encrypt_path) }/lets_encrypt_cronjob"
+      if fetch(:lets_encrypt_client) == "certbot-auto"
+        execute :sudo, "echo '0 0 * * 0 root #{ fetch(:lets_encrypt_path) }/certbot-auto renew --no-self-upgrade --allow-subset-of-names --post-hook \"#{fetch(:nginx_service_path)} restart\"  >> #{ fetch(:lets_encrypt_cron_log) } 2>&1' | cat > #{ fetch(:lets_encrypt_path) }/lets_encrypt_cronjob"
+      else
+        execute :sudo, "echo '0 0 * * 0 root certbot renew --no-self-upgrade --allow-subset-of-names --post-hook \"#{fetch(:nginx_service_path)} restart\"  >> #{ fetch(:lets_encrypt_cron_log) } 2>&1' | cat > #{ fetch(:lets_encrypt_path) }/lets_encrypt_cronjob"
+      end
       execute :sudo, "mv -f #{ fetch(:lets_encrypt_path) }/lets_encrypt_cronjob /etc/cron.d/lets_encrypt"
       execute :sudo, "chown -f root:root /etc/cron.d/lets_encrypt"
       execute :sudo, "chmod -f 0644 /etc/cron.d/lets_encrypt"
@@ -58,7 +75,11 @@ namespace :lets_encrypt do
   task :dry_renew do
     on release_roles fetch(:lets_encrypt_roles) do
       # execute :sudo, "#{ fetch(:lets_encrypt_path) }/certbot-auto renew --dry-run"
-      output = capture(:sudo, "#{ fetch(:lets_encrypt_path) }/certbot-auto renew --dry-run")
+      if fetch(:lets_encrypt_client) == "certbot-auto"
+        output = capture(:sudo, "#{ fetch(:lets_encrypt_path) }/certbot-auto renew --dry-run")
+      else
+        output = capture(:sudo, "certbot renew --dry-run")
+      end
       puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
       output.each_line do |line|
           puts line
@@ -97,7 +118,11 @@ namespace :lets_encrypt do
   task :certonly_expand do
     on release_roles fetch(:lets_encrypt_roles) do
       # execute "./certbot-auto certonly --webroot -w /var/www/example -d example.com -d www.example.com -w /var/www/thing -d thing.is -d m.thing.is"
-      execute :sudo, "#{ fetch(:lets_encrypt_path) }/certbot-auto --non-interactive --agree-tos --allow-subset-of-names --email #{fetch(:lets_encrypt_email)} certonly --webroot -w #{current_path}/public #{ Array(fetch(:lets_encrypt_domains)).map{ |d| "-d #{d.gsub(/^\*?\./, "")}#{ fetch(:lets_encrypt__www_domains,false) ? " -d www.#{d.gsub(/^\*?\./, "")}" : "" }" }.join(" ") } --expand"
+      if fetch(:lets_encrypt_client) == "certbot-auto"
+        execute :sudo, "#{ fetch(:lets_encrypt_path) }/certbot-auto --non-interactive --agree-tos --allow-subset-of-names --email #{fetch(:lets_encrypt_email)} certonly --webroot -w #{current_path}/public #{ Array(fetch(:lets_encrypt_domains)).map{ |d| "-d #{d.gsub(/^\*?\./, "")}#{ fetch(:lets_encrypt__www_domains,false) ? " -d www.#{d.gsub(/^\*?\./, "")}" : "" }" }.join(" ") } --expand"
+      else
+        execute :sudo, "certbot --non-interactive --agree-tos --allow-subset-of-names --email #{fetch(:lets_encrypt_email)} certonly --webroot -w #{current_path}/public #{ Array(fetch(:lets_encrypt_domains)).map{ |d| "-d #{d.gsub(/^\*?\./, "")}#{ fetch(:lets_encrypt__www_domains,false) ? " -d www.#{d.gsub(/^\*?\./, "")}" : "" }" }.join(" ") } --expand"
+      end
     end
   end
   

data/lib/capistrano/tasks/monit.rake

@@ -14,7 +14,7 @@ namespace :load do
     ## Status
     set :monit_active,                -> { true }
     set :monit_main_rc,               -> { true }
-    # set :monit_processes,             -> { %w[nginx pm2 postgresql pwa redis sidekiq thin website] }
+    # set :monit_processes,             -> { %w[nginx pm2 postgresql pwa redis sidekiq thin website website2 website3] }
     set :monit_processes,             -> { %w[nginx postgresql thin website] }
     set :monit_name,                  -> { "#{ fetch(:application) }_#{ fetch(:stage) }" }
     ## Mailer
@@ -61,6 +61,18 @@ namespace :load do
     set :monit_website_check_content, -> { false }
     set :monit_website_check_path,    -> { "/" }
     set :monit_website_check_text,    -> { "<!DOCTYPE html>" }
+    ## Website2
+    set :monit_website2_check_domains, -> { [] }
+    set :monit_website2_check_ssl,     -> { false }
+    set :monit_website2_check_content, -> { false }
+    set :monit_website2_check_path,    -> { "/" }
+    set :monit_website2_check_text,    -> { "<!DOCTYPE html>" }
+    ## Website3
+    set :monit_website3_check_domains, -> { [] }
+    set :monit_website3_check_ssl,     -> { false }
+    set :monit_website3_check_content, -> { false }
+    set :monit_website3_check_path,    -> { "/" }
+    set :monit_website3_check_text,    -> { "<!DOCTYPE html>" }
     ## M/Monit
     set :monit_mmonit_url,            -> { false }
     
@@ -103,7 +115,7 @@ namespace :monit do
       # invoke "monit:redis"
       # invoke "monit:thin"
       # invoke "monit:configure_website"
-      %w[nginx pm2 postgresql pwa redis sidekiq thin website].each do |command|
+      %w[nginx pm2 postgresql pwa redis sidekiq thin website website2 website3].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)
@@ -124,10 +136,11 @@ namespace :monit do
   end
   
   %w[nginx pm2 postgresql redis sidekiq thin].each do |process|
+    namespace process.to_sym do
       
       %w[monitor unmonitor start stop restart].each do |command|
         desc "#{command} monit-service for: #{process}"
-        task "#{command}_#{process}" do
+        task "#{command}" do
           if Array(fetch(:monit_processes)).include?(process)
             on roles(fetch("#{process}_roles".to_sym)) do
               if process == "sidekiq"
@@ -154,7 +167,7 @@ namespace :monit do
       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
+        task "configure" do
           if Array(fetch(:monit_processes)).include?(process)
             on release_roles fetch("#{process}_roles".to_sym) do |role|
               monit_config( process, nil, role )
@@ -164,7 +177,7 @@ namespace :monit do
       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
+        task "configure" do
           if Array(fetch(:monit_processes)).include?(process)
             on release_roles fetch("#{process}_roles".to_sym) do |role|
               monit_config process, "/etc/monit/conf.d/#{fetch(:application)}_#{fetch(:stage)}_#{process}.conf", role
@@ -173,19 +186,23 @@ namespace :monit do
         end
       end
       
+    end
   end
   
-  %w[pwa website].each do |process|
-    
-    desc "Upload Monit #{process} config file (app specific)"
-    task "configure_#{process}" do
-      if Array(fetch(:monit_processes)).include?(process)
-        on release_roles fetch("#{process == "website" ? 'nginx' : process}_roles".to_sym, :web) do |role|
-          monit_config process, "/etc/monit/conf.d/#{fetch(:application)}_#{fetch(:stage)}_#{process}.conf", role
+  %w[pwa website website2 website3].each do |process|
+    namespace process.to_sym do
+      
+      desc "Upload Monit #{process} config file (app specific)"
+      task "configure_#{process}" do
+        if Array(fetch(:monit_processes)).include?(process)
+          on release_roles fetch("#{process =~ /website/ ? 'nginx' : process}_roles".to_sym, :web) do |role|
+            process_file = process =~ /^website\d{1}$/ ? 'websiteX' : process
+            monit_config process, "/etc/monit/conf.d/#{fetch(:application)}_#{fetch(:stage)}_#{process}.conf", role
+          end
         end
       end
+      
     end
-    
   end
   
   

data/lib/capistrano/tasks/secrets.rake

@@ -116,6 +116,24 @@ namespace :secrets do
 end
 
 
+namespace :keys do
+  
+  desc "upload master.key to server"
+  task :upload_master do
+    on roles %w{app db web} do
+      
+      %w(master.key credentials.yml.enc).each do |that|
+        puts "syncing: #{that}"
+        local_dir = "./config/#{ that }"
+        remote_dir = "#{host.user}@#{host.hostname}:#{shared_path}/config/#{ that }"
+        run_locally { execute "rsync -av --delete #{local_dir} #{remote_dir}" }
+      end
+      
+    end
+  end
+  
+end
+
 
 
 desc 'Server setup tasks'

data/lib/capistrano/tasks/sidekiq_six.rake

@@ -0,0 +1,199 @@
+##
+## NEW!   for sidekiqs new deamonized style
+##
+
+# https://github.com/seuros/capistrano-sidekiq
+namespace :load do
+  task :defaults do
+    set :sidekiq_six_default_hooks,     -> { true }
+    set :sidekiq_six_deamon_file,       -> { "sidekiq_#{fetch(:application)}_#{fetch(:stage)}" }
+    set :sidekiq_six_timeout,           -> { 10 }
+    set :sidekiq_six_roles,             -> { :app }
+    set :sidekiq_six_processes,         -> { 1 }
+    # Sidekiq queued processes:
+    
+    set :sidekiq_six_special_queues,    -> { false }
+    set :sidekiq_six_queued_processes,  -> { [] }
+    ## If needed you can set special queues and configure it seperately
+    ## .. options:  
+    ##    - queue:      string    # => queue-name       (default: "default")
+    ##    - processes:  integer   # => number processes (default: 1)
+    ##    - worker:     integer   # => concurrency      (default: 7)
+    ## => [ { queue: "queue_name", processes: "count", worker: "count" }]
+    
+    set :sidekiq_six_deamon_path,       -> { "/lib/systemd/system" }
+    set :sidekiq_six_deamon_template,   -> { :default }
+    
+    set :sidekiq_six_ruby_vm,           -> { :system }   # ( :rvm | :rbenv | :system )
+    
+    set :sidekiq_six_user,              -> { 'deploy' }  # role-user
+    set :sidekiq_six_log_lines,         -> { 100 }
+    
+  end
+end
+
+
+namespace :sidekiq_six do
+  
+  def for_each_process(reverse = false, &block)
+    pids = processes_deamones
+    pids.reverse! if reverse
+    pids.each_with_index do |service_file, idx|
+      within fetch(:sidekiq_six_deamon_path) do
+        yield(service_file, idx)
+      end
+    end
+  end
+  
+  def processes_deamones
+    deamons = []
+    if fetch(:sidekiq_six_special_queues)
+      fetch(:sidekiq_six_queued_processes, []).each do |qp|
+        counter = (qp[:processes] && qp[:processes].to_i > 0 ? qp[:processes].to_i : 1)
+        if counter > 1
+          counter.times do |idx|
+            deamons.push "#{ fetch(:sidekiq_six_deamon_file) }-#{ qp[:queue] }-#{ idx }"
+          end
+        else
+          deamons.push "#{ fetch(:sidekiq_six_deamon_file) }-#{ qp[:queue] }"
+        end
+      end
+    else
+      counter = fetch(:sidekiq_six_processes).to_i 
+      if counter > 1
+        counter.times do |idx|
+          deamons.push "#{ fetch(:sidekiq_six_deamon_file) }-#{ idx }"
+        end
+      else
+        deamons.push "#{ fetch(:sidekiq_six_deamon_file) }"
+      end
+    end
+    deamons
+  end
+  
+  def sidekiq_special_config(idx)
+    if fetch(:sidekiq_six_special_queues)
+      settingz = []
+      fetch(:sidekiq_six_queued_processes).each do |that|
+        (that[:processes] && that[:processes].to_i > 0 ? that[:processes].to_i : 1 ).to_i.times do
+          sttng_hash = {}
+          sttng_hash[:queue] = that[:queue] ? that[:queue] : "default"
+          sttng_hash[:concurrency] = that[:worker] && that[:worker].to_i > 0 ? that[:worker].to_i : 7
+          settingz.push( sttng_hash )
+        end
+      end
+      settingz[ idx.to_i ]
+    else
+      {}
+    end
+  end
+  
+  def upload_deamon(service_file, idx = 0)
+    args = []
+    args.push "--environment #{fetch(:stage)}"
+    args.push "--require #{fetch(:sidekiq_six_require)}" if fetch(:sidekiq_six_require)
+    args.push "--tag #{fetch(:sidekiq_six_tag)}" if fetch(:sidekiq_six_tag)
+    if fetch(:sidekiq_six_special_queues)
+      queue_config = sidekiq_special_config(idx)
+      args.push "--queue #{ queue_config[:queue] || 'default' }"
+      args.push "--concurrency #{ queue_config[:concurrency] || 7 }"
+    else
+      Array(fetch(:sidekiq_six_queue)).each do |queue|
+        args.push "--queue #{queue}"
+      end
+      args.push "--concurrency #{fetch(:sidekiq_six_concurrency)}" if fetch(:sidekiq_six_concurrency)
+    end
+    args.push "--config #{fetch(:sidekiq_six_config)}" if fetch(:sidekiq_six_config)
+    # use sidekiq_options for special options
+    args.push fetch(:sidekiq_six_options) if fetch(:sidekiq_six_options)
+
+    side_kiq_args = args.compact.join(' ')
+    
+    @service_file   = service_file
+    @side_kiq_args  = side_kiq_args
+    
+    if fetch(:sidekiq_six_deamon_template, :default) == :default
+      magic_template("sidekiq.service", '/tmp/sidekiq.service')
+    else
+      magic_template(fetch(:sidekiq_six_deamon_template), '/tmp/sidekiq.service')
+    end
+    execute :sudo, :mv, '/tmp/sidekiq.service', "#{ fetch(:sidekiq_six_deamon_path) }/#{ service_file }.service"
+  end
+  
+  
+  ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### 
+  ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### 
+  
+  
+  desc 'Creates and uploads sidekiq6 DEAMON files'
+  task :upload_deamons  do
+    on roles fetch(:sidekiq_six_roles) do
+      for_each_process do |service_file, idx|
+        upload_deamon(service_file, idx)
+      end
+    end
+  end
+  
+  %w[start stop restart enable disable is-enabled].each do |cmnd|
+    desc "#{cmnd.capitalize} sidekiq6 service"
+    task cmnd.gsub(/-/, '_') do
+      on roles fetch(:sidekiq_six_roles) do
+        for_each_process do |service_file, idx|
+          execute :sudo, :systemctl, cmnd, service_file
+        end
+      end
+    end
+  end
+  
+  desc "Quiet sidekiq6 service"
+  task :quiet do
+    on roles fetch(:sidekiq_six_roles) do
+      for_each_process do |service_file, idx|
+        execute :sudo, :systemctl, 'kill -s TSTP', service_file
+      end
+    end
+  end
+  
+  desc "Get logs for sidekiq6 service"
+  task :logs do
+    on roles fetch(:sidekiq_six_roles) do
+      for_each_process do |service_file, idx|
+        execute :sudo, :journalctl, '-u', service_file, '-rn', fetch(:sidekiq_six_log_lines, 100)
+      end
+    end
+  end
+  
+  
+  desc "check sidekiq6 service status"
+  task :check_status do
+    on roles fetch(:sidekiq_six_roles) do
+      for_each_process do |service_file, idx|
+        puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
+        puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
+        puts service_file
+        puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
+        output = capture :sudo, "systemctl status", service_file
+        output.each_line do |line|
+            puts line
+        end
+        puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
+      end
+    end
+  end
+  
+  
+end
+
+
+namespace :deploy do
+  before :starting, :stop_sidekiq_services do
+    if fetch(:sidekiq_six_default_hooks)
+      invoke "sidekiq_six:stop"
+    end
+  end
+  after :finished, :restart_sidekiq_services do
+    if fetch(:sidekiq_six_default_hooks)
+      invoke "sidekiq_six:start"
+    end
+  end
+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_deamonize,              -> { true }
     set :thin_hooks,                  -> { true }
     
   end
@@ -29,7 +30,7 @@ namespace :thin do
         magic_template("thin_app_yml", '/tmp/thin_app.yml')
         execute :sudo, :mv, '/tmp/thin_app.yml', "config/thin_app_#{fetch(:stage)}.yml"
         execute :sudo, :rm, ' -f', "#{fetch(:thin_path)}/thin_#{fetch(:application)}_#{fetch(:stage)}*"
-        execute :sudo, :ln, ' -sf', "#{current_path}/config/thin_app_#{fetch(:stage)}.yml", "#{fetch(:thin_path)}/thin_#{fetch(:application)}_#{fetch(:stage)}.yml"
+        execute :sudo, :ln, ' -sf', "#{shared_path}/config/thin_app_#{fetch(:stage)}.yml", "#{fetch(:thin_path)}/thin_#{fetch(:application)}_#{fetch(:stage)}.yml"
       end
     end
   end

data/lib/capistrano/tasks/thin_sysd.rake

@@ -0,0 +1,113 @@
+require 'capistrano/magic_recipes/base_helpers'
+include Capistrano::MagicRecipes::BaseHelpers
+
+namespace :load do
+  task :defaults do
+    
+    set :thin_path,                   -> { '/etc/thin' }
+    set :thin_roles,                  -> { :web }
+    
+    set :thin_timeout,                -> { 30 }
+    set :thin_max_conns,              -> { 1024 }
+    set :thin_max_persistent_conns,   -> { 512 }
+    set :thin_require,                -> { [] }
+    set :thin_wait,                   -> { 90 }
+    set :thin_onebyone,               -> { true }
+    set :thin_deamonize,              -> { true }
+    set :thin_hooks,                  -> { true }
+    
+    set :thin_deamon_file,            -> { "thin_#{fetch(:application)}_#{fetch(:stage)}" }
+    set :thin_deamon_path,            -> { "/lib/systemd/system" }
+    set :thin_deamon_template,        -> { :default }
+    set :thin_deamon_log_lines,       -> { 100 }
+    
+  end
+end
+
+
+namespace :thin do
+  
+  def upload_deamon(service_file, idx = 0)
+    if fetch(:thin_deamon_template, :default) == :default
+      magic_template("thin.service", '/tmp/thin.service')
+    else
+      magic_template(fetch(:thin_deamon_template), '/tmp/thin.service')
+    end
+    execute :sudo, :mv, '/tmp/thin.service', "#{ fetch(:thin_deamon_path) }/#{ fetch(:thin_deamon_file) }.service"
+  end
+  
+  
+  desc "rewrite and upload thin config"
+  task :reconf do
+    on release_roles fetch(:thin_roles) do
+      within current_path do
+        magic_template("thin_app_yml", '/tmp/thin_app.yml')
+        execute :sudo, :mv, '/tmp/thin_app.yml', "config/thin_app_#{fetch(:stage)}.yml"
+        execute :sudo, :rm, ' -f', "#{fetch(:thin_path)}/thin_#{fetch(:application)}_#{fetch(:stage)}*"
+        execute :sudo, :ln, ' -sf', "#{shared_path}/config/thin_app_#{fetch(:stage)}.yml", "#{fetch(:thin_path)}/thin_#{fetch(:application)}_#{fetch(:stage)}.yml"
+      end
+    end
+  end
+  
+  
+  
+  %w[start stop restart enable disable is-enabled].each do |cmnd|
+    desc "#{cmnd.capitalize} thin service"
+    task cmnd.gsub(/-/, '_') do
+      on roles fetch(:thin_roles) do
+        execute :sudo, :systemctl, cmnd, fetch(:thin_deamon_file)
+      end
+    end
+  end
+  
+  desc "Quiet thin service"
+  task :quiet do
+    on roles fetch(:thin_roles) do
+      execute :sudo, :systemctl, 'kill -s TSTP', fetch(:thin_deamon_file)
+    end
+  end
+  
+  desc "Get logs for thin service"
+  task :logs do
+    on roles fetch(:thin_roles) do
+      execute :sudo, :journalctl, '-u', fetch(:thin_deamon_file), '-rn', fetch(:thin_deamon_log_lines, 100)
+    end
+  end
+  
+  
+  desc "check thin service status"
+  task :check_status do
+    on roles fetch(:thin_roles) do
+        puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
+        puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
+        puts fetch(:thin_deamon_file)
+        puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
+        output = capture :sudo, "systemctl status", fetch(:thin_deamon_file)
+        output.each_line do |line|
+            puts line
+        end
+        puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
+    end
+  end
+  
+  
+end
+
+
+# => after 'deploy:published', nil do
+# =>   on release_roles fetch(:thin_roles) do
+# =>     invoke "thin:reconf"
+# =>     invoke "thin:restart"
+# =>   end
+# => end
+
+
+namespace :deploy do
+  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/website.erb

@@ -28,11 +28,3 @@ check host <%= domain %> with address <%= domain %>
   then alert
 <% end %>
 
-
-### For Version 5.6:
-# check host example.com with address example.com
-#   if failed
-#     url https://example.com
-#     timeout 10 seconds
-#     for 3 cycles 
-#   then alert

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

@@ -0,0 +1,23 @@
+# Check domains on <%= fetch(:nginx_use_ssl) ? 'https' : 'http' %> for <%= fetch(:application) %> [<%= fetch(:stage) %>]
+<% domain_list.uniq.each do |domain| %>
+check host <%= domain %> with address <%= domain %>
+  if failed 
+  <% if fetch(:nginx_use_ssl) %>
+    port 443
+    type TCPSSL
+    protocol https
+  <% else %>
+    port 80
+    protocol http
+  <% end %>
+  <% if fetch(:monit_website_check_content, false) %>
+    request "<%= fetch(:monit_website_check_path, '/') %>"
+    content = "<%= fetch(:monit_website_check_text, '<!DOCTYPE html>') %>"
+  <% else %>
+    # status = 200
+  <% end %>
+    with timeout <%= fetch(:monit_website_check_timeout, 10) %> seconds
+    for <%= fetch(:monit_website_check_cycles, 3) %> cycles 
+  then alert
+<% end %>
+

data/lib/generators/capistrano/magic_recipes/templates/redirect_page.html.erb

@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="x-ua-compatible" content="ie=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
+  <meta http-equiv="refresh" content="5; URL=<%= fetch(:redirect_new_domain) %>">
   <title>Wir werden <%= fetch(:redirect_new_name) %></title>
   <script src="https://cdn.jsdelivr.net/npm/vue"></script>
   
@@ -87,7 +87,7 @@
       el: '#app',
       data: {
         domain: String(window.location).split('://')[1].split('/')[0],
-        count: 10,
+        count: 3,
         interval: null
       },
       methods: {

data/lib/generators/capistrano/magic_recipes/templates/sidekiq.docu-service.erb

@@ -0,0 +1,79 @@
+#
+# This file tells systemd how to run Sidekiq as a 24/7 long-running daemon.
+#
+# Customize this file based on your bundler location, app directory, etc.
+# Customize and copy this into /usr/lib/systemd/system (CentOS) or /lib/systemd/system (Ubuntu).
+# Then run:
+#   - systemctl enable <%= @service_file %>
+#   - systemctl {start,stop,restart} <%= @service_file %>
+#
+# This file corresponds to a single Sidekiq process.  Add multiple copies
+# to run multiple processes (sidekiq-1, sidekiq-2, etc).
+#
+# Use `journalctl -u <%= @service_file %> -rn 100` to view the last 100 lines of log output.
+#
+[Unit]
+Description=<%= @service_file %>
+# start us only once the network and logging subsystems are available,
+# consider adding redis-server.service if Redis is local and systemd-managed.
+After=syslog.target network.target
+
+# See these pages for lots of options:
+#
+#   https://www.freedesktop.org/software/systemd/man/systemd.service.html
+#   https://www.freedesktop.org/software/systemd/man/systemd.exec.html
+#
+# THOSE PAGES ARE CRITICAL FOR ANY LINUX DEVOPS WORK; read them multiple
+# times! systemd is a critical tool for all developers to know and understand.
+#
+[Service]
+#
+#      !!!!  !!!!  !!!!
+#
+# As of v6.0.6, Sidekiq automatically supports systemd's `Type=notify` and watchdog service
+# monitoring. If you are using an earlier version of Sidekiq, change this to `Type=simple`
+# and remove the `WatchdogSec` line.
+#
+#      !!!!  !!!!  !!!!
+#
+Type=notify
+# If your Sidekiq process locks up, systemd's watchdog will restart it within seconds.
+WatchdogSec=10
+
+WorkingDirectory=<%= current_path %>
+<% if fetch(:sidekiq_six_ruby_vm) == :rbenv %>
+# If you use rbenv:
+ExecStart=/bin/bash -lc 'exec /home/deploy/.rbenv/shims/bundle exec sidekiq <%= @side_kiq_args %>'
+<% elsif fetch(:sidekiq_six_ruby_vm) == :rvm %>
+# RVM
+ExecStart=<%= fetch(:rvm_path) %>/bin/rvm <%= fetch(:rvm_ruby_version) %> do bundle exec sidekiq <%= @side_kiq_args %>
+<% else %>
+# If you use the system's ruby:
+ExecStart=/usr/local/bin/bundle exec sidekiq <%= @side_kiq_args %>
+<% end %>
+
+
+# Use `systemctl kill -s TSTP <%= @service_file %>` to quiet the Sidekiq process
+
+# !!! Change this to your deploy user account !!!
+User=<%= fetch(:sidekiq_six_user) %>
+Group=<%= fetch(:sidekiq_six_user) %>
+UMask=0002
+
+# Greatly reduce Ruby memory fragmentation and heap usage
+# https://www.mikeperham.com/2018/04/25/taming-rails-memory-bloat/
+Environment=MALLOC_ARENA_MAX=2
+
+# if we crash, restart
+RestartSec=1
+Restart=on-failure
+
+# output goes to /var/log/syslog (Ubuntu) or /var/log/messages (CentOS)
+StandardOutput=syslog
+StandardError=syslog
+
+# This will default to "bundler" if we don't specify it
+SyslogIdentifier=<%= @service_file %>
+
+[Install]
+WantedBy=multi-user.target

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

@@ -0,0 +1,33 @@
+[Unit]
+Description=<%= @service_file %>
+After=syslog.target network.target
+
+[Service]
+Type=notify
+WatchdogSec=10
+
+WorkingDirectory=<%= current_path %>
+<% if fetch(:sidekiq_six_ruby_vm) == :rbenv %>
+ExecStart=/bin/bash -lc 'exec /home/deploy/.rbenv/shims/bundle exec sidekiq <%= @side_kiq_args %>'
+<% elsif fetch(:sidekiq_six_ruby_vm) == :rvm %>
+ExecStart=<%= fetch(:rvm_path) %>/bin/rvm <%= fetch(:rvm_ruby_version) %> do bundle exec sidekiq <%= @side_kiq_args %>
+<% else %>
+ExecStart=/usr/local/bin/bundle exec sidekiq <%= @side_kiq_args %>
+<% end %>
+
+User=<%= fetch(:sidekiq_six_user) %>
+Group=<%= fetch(:sidekiq_six_user) %>
+UMask=0002
+
+Environment=MALLOC_ARENA_MAX=2
+
+RestartSec=1
+Restart=on-failure
+
+StandardOutput=/var/log/syslog
+StandardError=/var/log/syslog
+
+SyslogIdentifier=sidekiq
+
+[Install]
+WantedBy=multi-user.target

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

@@ -0,0 +1,33 @@
+[Unit]
+Description=<%= fetch(:thin_deamon_file) %>
+After=syslog.target
+After=network.target
+
+[Service]
+Type=forking
+
+User=<%= @role.user %>
+Group=<%= @role.user %>
+
+WorkingDirectory=<%= current_path %>
+<% if fetch(:sidekiq_six_ruby_vm) == :rbenv %>
+ExecStart=/bin/bash -lc 'exec /home/deploy/.rbenv/shims/bundle exec thin -C config/thin_app_<%= fetch(:stage) %>.yml start'
+ExecStop=/bin/bash -lc 'exec /home/deploy/.rbenv/shims/bundle exec thin -C config/thin_app_<%= fetch(:stage) %>.yml stop'
+ExecReload=/bin/bash -lc 'exec /home/deploy/.rbenv/shims/bundle exec thin -C config/thin_app_<%= fetch(:stage) %>.yml restart'
+<% elsif fetch(:sidekiq_six_ruby_vm) == :rvm %>
+ExecStart=<%= fetch(:rvm_path) %>/bin/rvm <%= fetch(:rvm_ruby_version) %> do bundle exec thin -C config/thin_app_<%= fetch(:stage) %>.yml start
+ExecStop=<%= fetch(:rvm_path) %>/bin/rvm <%= fetch(:rvm_ruby_version) %> do bundle exec thin -C config/thin_app_<%= fetch(:stage) %>.yml stop
+ExecReload=<%= fetch(:rvm_path) %>/bin/rvm <%= fetch(:rvm_ruby_version) %> do bundle exec thin -C config/thin_app_<%= fetch(:stage) %>.yml restart
+<% else %>
+ExecStart=/usr/local/bin/bundle exec thin -C config/thin_app_<%= fetch(:stage) %>.yml start
+ExecStop=/usr/local/bin/bundle exec thin -C config/thin_app_<%= fetch(:stage) %>.yml stop
+ExecReload=/usr/local/bin/bundle exec thin -C config/thin_app_<%= fetch(:stage) %>.yml restart
+<% end %>
+
+TimeoutSec=<%= fetch(:thin_wait) %>
+Restart=always
+
+SyslogIdentifier=thin
+
+[Install]
+WantedBy=multi-user.target

data/lib/generators/capistrano/magic_recipes/templates/thin_app_yml.erb

@@ -15,5 +15,5 @@ wait: <%= fetch(:thin_wait) %>
 servers: <%= fetch(:app_instances) %>
 # user: <%= fetch(:user) %>
 socket: /tmp/thin.<%= fetch(:application) %>.<%= fetch(:stage) %>.sock
-daemonize: true
+daemonize: <%= fetch(:thin_deamonize) %>
 onebyone: <%= fetch(:thin_onebyone) %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.91
+  version: 0.0.93
 platform: ruby
 authors:
 - Torsten Wetzel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2022-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -147,6 +147,7 @@ files:
 - Rakefile
 - lib/capistrano/magic_recipes.rb
 - lib/capistrano/magic_recipes/assets.rb
+- lib/capistrano/magic_recipes/backup.rb
 - lib/capistrano/magic_recipes/base_helpers.rb
 - lib/capistrano/magic_recipes/db.rb
 - lib/capistrano/magic_recipes/exception_pages.rb
@@ -160,9 +161,12 @@ files:
 - lib/capistrano/magic_recipes/redis.rb
 - lib/capistrano/magic_recipes/secrets.rb
 - lib/capistrano/magic_recipes/sidekiq.rb
+- lib/capistrano/magic_recipes/sidekiq_six.rb
 - lib/capistrano/magic_recipes/thin.rb
+- lib/capistrano/magic_recipes/thin_sysd.rb
 - lib/capistrano/magic_recipes/version.rb
 - lib/capistrano/tasks/assets.rake
+- lib/capistrano/tasks/backup.rake
 - lib/capistrano/tasks/db.rake
 - lib/capistrano/tasks/exception_pages.rake
 - lib/capistrano/tasks/inform_slack.rake
@@ -176,7 +180,9 @@ files:
 - lib/capistrano/tasks/redis.rake
 - lib/capistrano/tasks/secrets.rake
 - lib/capistrano/tasks/sidekiq.rake
+- lib/capistrano/tasks/sidekiq_six.rake
 - lib/capistrano/tasks/thin.rake
+- lib/capistrano/tasks/thin_sysd.rake
 - lib/generators/capistrano/magic_recipes/templates/capistrano3_nginx_conf.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/monitrc.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/nginx.erb
@@ -188,6 +194,7 @@ files:
 - lib/generators/capistrano/magic_recipes/templates/monit/sidekiq.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/thin.erb
 - lib/generators/capistrano/magic_recipes/templates/monit/website.erb
+- lib/generators/capistrano/magic_recipes/templates/monit/websiteX.erb
 - lib/generators/capistrano/magic_recipes/templates/nginx.conf.erb
 - lib/generators/capistrano/magic_recipes/templates/nginx/diffie_hellman.erb
 - lib/generators/capistrano/magic_recipes/templates/nginx/media_cache_path.erb
@@ -201,6 +208,9 @@ files:
 - lib/generators/capistrano/magic_recipes/templates/postgresql.yml.erb
 - lib/generators/capistrano/magic_recipes/templates/redirect_page.html.erb
 - lib/generators/capistrano/magic_recipes/templates/secrets_yml.erb
+- lib/generators/capistrano/magic_recipes/templates/sidekiq.docu-service.erb
+- lib/generators/capistrano/magic_recipes/templates/sidekiq.service.erb
+- lib/generators/capistrano/magic_recipes/templates/thin.service.erb
 - lib/generators/capistrano/magic_recipes/templates/thin_app_yml.erb
 - lib/magic_recipes_two.rb
 - lib/tasks/magic_recipes_two_tasks.rake
@@ -208,7 +218,7 @@ homepage: https://github.com/berlinmagic/magic_recipes_two
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -223,9 +233,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.8
+signing_key:
 specification_version: 4
 summary: Some recipes for rails-4 and capistrano-3.
 test_files: []