magic_recipes_two 0.0.76 → 0.0.77

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzdmZGRkYjdmMzY0OTIyM2ZkYjA5YzllMWU1NzQ5ODE5OTgxNmJlNw==
+    OWExNzJkMGUwNTBlODUyNDRjMzQ5NDRjYTBmYTg3Yzg2NWU1MGU2YQ==
   data.tar.gz: !binary |-
-    ZjA0OGI5ZjJmOGQ5ZmRhZjMyZWM4MDQ2MWEyYWMzNjc3ZWI0NWQ0MA==
+    MDBlMjQyOTJkOTJmMmYyOTIyMzg0NTkzNDk4YmM1YWIwOGUxZWZhZQ==
 SHA512:
   metadata.gz: !binary |-
-    YzFlZDVhMThkYTUwOTRkMTU3NDcwY2U4MTM3ODNlYjg2Yjg5MTMyODk5Zjc3
-    MjQwY2IwYzI0Yzc4ODY1ZjhlYzBmYWMzZDViOGRkMzJkM2YyMmJhM2NmNDQz
-    MGVhMGExNzA1YmJkODk2ODI1MzU2NDFmOGY3NzNhZDM2Mzc2MGQ=
+    NzA0Nzc5YmYxNmMzMGM3ODE2ZDJlYTZhOWM4NmY1NTFhYzBhZjIxNGM1YmQ2
+    ZWY0MzdmNGFhZmYxM2YxOGM5NTRlM2NmYzk2YjZjMDA3MWY3OGY5OTA0NDA1
+    MmJjYTM5MGExZmNiMzUwMjFiMzc1MzU2NWI5NzcwY2I3ZjljNGU=
   data.tar.gz: !binary |-
-    MzU2NDI4Y2JmMzc3OWIxNjBhOTlmYjI5MjE1NWNmOGFkMWU1NDMyOWQ3ZDYx
-    M2RlZmRjMDk5MzNhZmEzZjg2YjQyZTkwYzMxNmU5ZTM4MDdlY2FiMDI2ODA5
-    M2FiY2Y0YTNlNWQzZjBjYzBjMWU2NjQwNWVlOWU2ZmM2ZWYxNTg=
+    NzA3NDcyNDI5ZmE4YjAzMzc0OTVmYjc5OTBlNmE1MjRkYzFkOGNkMzM5ZmU0
+    YmU5NzI2ZmVhZDY0ZjAzYzk1YmExMzBjYjk4MDE3MmVmMzI1NjAyY2U2MDhl
+    YjNhMGZkYzZlZmM4ZTA3YjkzYTJmYjdiMTFjN2QzNjE3MjZkYzU=

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.76"
+    VERSION = "0.0.77"
   end
 end

data/lib/capistrano/tasks/monit.rake

@@ -24,6 +24,7 @@ namespace :load do
     set :monit_mail_to,               -> { "foo@example.com" }
     set :monit_mail_from,             -> { "monit@foo.bar" }
     set :monit_mail_reply_to,         -> { "support@foo.bar" }
+    set :monit_ignore,                -> { [] }  # %w[action pid]
     ## Additional stuff for postrgres
     set :postgresql_roles,            -> { :db }
     set :postgresql_pid,              -> { "/var/run/postgresql/9.1-main.pid" }
@@ -34,6 +35,8 @@ namespace :load do
     set :monit_sidekiq_timeout_sec,   -> { 90 }
     ## Additional App helpers
     set :monit_app_worker_command,    -> { "cd #{ current_path } ; #{fetch(:rvm_path)}/bin/rvm #{fetch(:rvm_ruby_version)} do bundle exec MONIT_CMD" }
+    set :monit_app_worker_role,       -> { :user }  # user / bash / shell
+    set :monit_app_worker_prefix,     -> { :rvm }   # rvm / rvm1capistrano3 / env
     ## WebClient
     set :monit_http_client,           -> { true }
     set :monit_http_domain,           -> { false }
@@ -169,7 +172,28 @@ def monit_config( name, destination = nil, role = nil )
 end
 
 def monit_app_prefixed( cmd )
-  fetch(:monit_app_worker_command, "cd #{ current_path } ; bundle exec MONIT_CMD").to_s.gsub(/MONIT_CMD/, 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
+  when "sh", "shell"
+    komando = "/bin/sh -c 'COMMAND_PREFIX bundle exec MONIT_CMD'"
+  when "bash"
+    komando = "/bin/bash -c 'REAL_COMMAND_HERE'"
+  else
+    komando = "/bin/su - #{role.user} -c 'REAL_COMMAND_HERE'"
+  end
+  
+  case fetch(:monit_app_worker_prefix, :env).to_s.downcase.strip
+  when "rvm"
+    komando.gsub!(/REAL_COMMAND_HERE/, "cd #{ current_path } ; #{fetch(:rvm_path)}/bin/rvm #{fetch(:rvm_ruby_version)} do bundle exec MONIT_CMD")
+  when "rvm1capistrano3", "rvm1capistrano", "rvm1"
+    komando.gsub!(/REAL_COMMAND_HERE/, "cd #{ current_path } ; #{fetch(:rvm1_auto_script_path)}/rvm-auto.sh #{fetch(:rvm1_ruby_version)} bundle exec MONIT_CMD")
+  else
+    komando.gsub!(/REAL_COMMAND_HERE/, "/usr/bin/env cd #{current_path} ; bundle exec MONIT_CMD")
+  end
+  
+  komando.gsub(/MONIT_CMD/, cmd)
+  
 end
 
 

data/lib/capistrano/tasks/nginx.rake

@@ -6,6 +6,7 @@ namespace :load do
   task :defaults do
     set :nginx_domains,               -> { [] }
     set :nginx_major_domain,          -> { false }
+    set :nginx_domain_wildcard,       -> { false }
     set :nginx_remove_www,            -> { true }
     set :default_site,                -> { false }
     set :app_instances,               -> { 1 }
@@ -147,6 +148,16 @@ namespace :nginx do
       Array( fetch(:nginx_domains) ).map{ |d| clear_domain(d) }.uniq
     end
     
+    def nginx_domains_with_www
+      domains = []
+      nginx_domains.each do |domain|
+        domains << domain
+        domains << "www.#{domain}"  unless  domain =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/
+        domains << ".#{domain}"     if      fetch(:nginx_domain_wildcard, false)
+      end
+      domains
+    end
+    
     def nginx_major_domain
       fetch(:nginx_major_domain, false) ? clear_domain( fetch(:nginx_major_domain) ) : false
     end

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

@@ -42,7 +42,7 @@ set mailserver <%= fetch(:monit_mail_server) %> port <%= fetch(:monit_mail_port)
     <% end %>
     with timeout 30 seconds
 
-set alert <%= fetch(:monit_mail_to) %>
+set alert <%= fetch(:monit_mail_to) %><%= Array( fetch(:monit_ignore, nil) ).count > 0 ? " but not on { #{ Array( fetch(:monit_ignore, nil) ).join(", ") } }" : "" %>
 
 <% if fetch(:monit_http_client) %>
 set httpd port <%= fetch(:monit_http_port) %>

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

@@ -17,18 +17,8 @@ upstream thin_<%= fetch(:application) %>_<%= fetch(:stage) %>_cluster {
 <% if fetch(:nginx_major_domain) %>
 server {
   listen                80<%= ' default_server' if fetch(:default_site) %>;
-  server_name           <%= nginx_domains.join(joiner) %>
+  server_name           <%= nginx_domains_with_www.join(joiner) %>
                         <%= nginx_major_domain %>;
-  
-  <%# 
-      ## https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/#taxing-rewrites
-      # return 301 https://xxxxx$request_uri;
-      # rewrite ^ http://xxxxx$request_uri? permanent;
-      # location / {
-      #   return 301 https://xxxxx$request_uri;
-      # }
-  #%>
-  
   return 301 https://<%= nginx_major_domain %>$request_uri;
   
 }
@@ -36,23 +26,12 @@ server {
   listen 80;
   server_name           <%= nginx_domains.map{ |d| subdomain_regex(d) }.join(joiner) %>
                         <%= subdomain_regex( nginx_major_domain ) %>;
-  
-  <%#
-      ## https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/#taxing-rewrites
-      # return 301 https://$sub.xxxxx$request_uri;
-      # rewrite ^ http://$sub.xxxxx$request_uri? permanent;
-      # location / {
-      #   return 301 https://$sub.xxxxx$request_uri;
-      # }
-  #%>
-  
   return 301 https://$sub.<%= nginx_major_domain %>$request_uri;
-  
 }
 <% else %>
 server {
   listen                80;
-  server_name           <%= nginx_domains.join(joiner) %>;
+  server_name           <%= nginx_domains_with_www.join(joiner) %>;
   return 301 https://$host$request_uri;
 }
 server {
@@ -90,7 +69,7 @@ server {
 <% else %>
 server {
   listen                80;
-  server_name           <%= nginx_domains.join(joiner) %>;
+  server_name           <%= nginx_domains_with_www.join(joiner) %>;
   return 301 http://<%= nginx_major_domain %>$request_uri;
 }
 server {
@@ -115,9 +94,9 @@ server {
   listen                [::]:80<%= ' default deferred' if fetch(:default_site) %>;
 <% end %>
   <% if fetch(:nginx_major_domain) %>
-  server_name           <%= ".#{fetch(:nginx_major_domain).gsub(/^\*?\./, "")}" %>;
+  server_name           <%= "#{fetch(:nginx_domain_wildcard, false) ? "." : ""}#{fetch(:nginx_major_domain).gsub(/^\*?\./, "")}" %>;
   <% else %>
-  server_name           <%= nginx_domains.join(joiner) %>;
+  server_name           <%= nginx_domains_with_www.join(joiner) %>;
   <% end %>
   
   <%= magic_render("nginx/remove_www") %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.76
+  version: 0.0.77
 platform: ruby
 authors:
 - Torsten Wetzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-21 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails