magic_recipes_two 0.0.60 → 0.0.61

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWU1ZTk5ODlhNmNkZWE2NmU2ODg0NDg0MmE3YjA1YTVkNjI4ZWFmNg==
+    MzI5ZmZlMmYwYzgwZjllZDBjYTY2MmE4ZjdiYmI2NzM4ZTZmZWJhYQ==
   data.tar.gz: !binary |-
-    MDA3ZjJiMmZmNDBhMzNjMTVmYjZiM2Y1MDg5NzQ1ODIwZTJkMmI5MQ==
+    NWZhNmQ1YjQ2OWE0NzNhZGNlNWJhZGI5MTBkZDMyNDVhYzQzYzZiMQ==
 SHA512:
   metadata.gz: !binary |-
-    MmU2NjQ5MmNkNWViYjY1MjhjZjRhNmY2MzYyYzBiNjM5OWNiYThlNDFkM2Vm
-    YWNmOGEwNzIyYTZmNzhkNjQzOTQwMTIwMzMzMmY5ZTRkNjM1ZTJmMTAyYTZj
-    N2ViZGVmZDU1Nzg1ZWI5ZDMyOTlmYmMwMjJlZGIyZmI3N2U1NjE=
+    ZDMxZDVlZGYzODI3ODdjNDkyMmUzNmI4MmU4M2RiMDA5NjM1MDBlY2ZjZGUx
+    NGQzNzZlNjJlYmY4NTM5ZmY1ZjJiNmM0ZjZjZjgyNmQ1Y2JlNGMwMjJmMDY4
+    ZGFiOWNjZjJmYTA4N2Q5OGQ2ZGJlNzYzYjU0NWNjMDg2ZWMxNjg=
   data.tar.gz: !binary |-
-    NGU5YTgxODc5NGJkYjE0ZDRlM2ZlNTk1Y2RkNzUwOTcxYzZjMzE0NTUzOTI0
-    YjNmMWE3OTIyMjAzMzJmZGRmZjBiMjg4ZmMzODNhODI3MDNjMDY2N2I3ZTI4
-    NWM1MGJkOTJmMjViYjNmOTBkYzUzOTE3ZGY3MjljYzk2NGM0YWY=
+    MGE1Y2U2NDc5NThhZWVlYzY5ODQ0YmU1MjM1OGFjNTkzNWM2NDUzYzMyMjU5
+    YWMyNmY2M2NjYzQwMjMyZWZkMmJjMmUxNmFiYTE2ODRiYTU3NzViM2VhNWE5
+    YzFlYzBiMTVhYjdjNmM0ZTg3ZjFjMTQzZTZhN2YwMWQ1Y2U5MTY=

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.60"
+    VERSION = "0.0.61"
   end
 end

data/lib/capistrano/tasks/lets_encrypt.rake

@@ -5,6 +5,7 @@ namespace :load do
   task :defaults do
     set :lets_encrypt_roles,        -> { :web }
     set :lets_encrypt_path,         -> { "~" }
+    set :lets_encrypt_domains,      -> { fetch(:nginx_major_domain,false) ? [fetch(:nginx_major_domain)] + Array(fetch(:nginx_domains)) : Array(fetch(:nginx_domains)) }
     set :lets_encrypt_renew_minute, -> { "23" }
     set :lets_encrypt_renew_hour1,  -> { "0" }
     set :lets_encrypt_renew_hour2,  -> { "12" }
@@ -29,7 +30,7 @@ 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 certonly --webroot -w #{current_path}/public#{ fetch(:nginx_major_domain, false) ? " -d #{fetch(:nginx_major_domain).to_s.gsub(/^\*?\./, "")} -d www.#{fetch(:nginx_major_domain).to_s.gsub(/^\*?\./, "")}" : ""} #{ Array(fetch(:nginx_domains)).map{ |d| "-d #{d.gsub(/^\*?\./, "")} -d www.#{d.gsub(/^\*?\./, "")}" }.join(" ") }"
+      execute :sudo, "#{ fetch(:lets_encrypt_path) }/certbot-auto certonly --webroot -w #{current_path}/public #{ Array(fetch(:lets_encrypt_domains)).map{ |d| "-d #{d.gsub(/^\*?\./, "")} -d www.#{d.gsub(/^\*?\./, "")}" }.join(" ") }"
     end
   end
   

data/lib/capistrano/tasks/nginx.rake

@@ -74,6 +74,31 @@ namespace :nginx do
       end
     end
   end
+  
+  desc "check nginx version"
+  task :version do
+    on release_roles fetch(:nginx_roles) do
+      output = capture("nginx -v")
+      puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
+      output.each_line do |line|
+          puts line
+      end
+      puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
+    end
+  end
+  
+  desc "check nginx conf"
+  task :check_conf do
+    nginx_service = fetch(:nginx_service_path)
+    on release_roles fetch(:nginx_roles) do
+      output = capture(:sudo, "nginx -t")
+      puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
+      output.each_line do |line|
+          puts line
+      end
+      puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
+    end
+  end
 
   after 'deploy:check', nil do
     on release_roles fetch(:nginx_roles) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.60
+  version: 0.0.61
 platform: ruby
 authors:
 - Torsten Wetzel