magic_recipes_two 0.0.72 → 0.0.73

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2E1MDdiZGMyMTZhZGEyMWI0NTEyYmVkY2I0ODkxZDYwZTZmYWRiZA==
+    Yzk1NDA3YjFjNzFjMDgxZmFmNDQzMTgxZDhhYzY2NzM4MDFhMzBkOQ==
   data.tar.gz: !binary |-
-    YzU3YzI0Yjg0NjJkZjQ0Zjc0MTczZjE3OWJhZWUxZTgwNjAxZDM3Ng==
+    NDA3YjIzNjJkMzQ0Y2ExNGJkM2ZkZGEzOWZjZWZkZjIyOThkYjQ0NQ==
 SHA512:
   metadata.gz: !binary |-
-    YTI2ZDE5ZmVlY2MwNDVjZDFmY2U5ZDUzNzUwODMyNzYxMDU1ODIwZjE2ZTI3
-    ZTg3MjI5MzVmYzg5ZDEzYjE3OWI1NzBlOTliYzdjMGNmNDUwMTQ1ZDRlYjI2
-    YTlhMzM4ZmI1YzZjZTdhYmUyMDU4YzFhZmMwNWZkODc1MWQxYjQ=
+    ODVkZTRiMzQ2MDI5MzM3ODQ3NjM0MjI1YTQxM2ZiMjFjYTY0YzUwMjZlNjc4
+    MjNkMWIwNWRiYjQ3OGNkYjE5MmZjZmZiYTBkODE4NzE5MjQyM2JjM2EwMDNj
+    MThhZWRlMmIzZGZjMWE5YTgwNTFlZGM4ZjE3ZGY0NDY5YmJhYzU=
   data.tar.gz: !binary |-
-    OTQ0ODJkYTU1MzNmZWY3YTc1NDFiZGU5YmVmNGMzZTAxNGFjOTUyZGZlNDk1
-    MWI2OWRhODE2NzJiZmIwMTE2MzQ1MGY1M2RkZWUxNzg3NmU5ZmVhNmIxNWE5
-    YTg2NjM4MjcxOWI0ZGMyODg4ZWZmMjk4MzNhNTU3ZGEyYWVhMzc=
+    YTY5YTNjMjY5YWU3MTQwMDMzM2JmOGMwMDRhYmNlOTI3ZDFlMjUyZjIwODdj
+    NDllODYxNjg2M2ZjYzBhYWUyNzVlZGUwZmZiZDYyNTdiN2RkOWM3MjU3NmZi
+    YmZkZTM1NjYwYWFhMWU4MjU0N2UxNzQyYjg0ZjA5MTQ2ZTA3MjA=

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.72"
+    VERSION = "0.0.73"
   end
 end

data/lib/capistrano/tasks/lets_encrypt.rake

@@ -6,6 +6,7 @@ namespace :load 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__www_domains, -> { true }
     set :lets_encrypt_renew_minute, -> { "23" }
     set :lets_encrypt_renew_hour1,  -> { "0" }
     set :lets_encrypt_renew_hour2,  -> { "12" }
@@ -32,7 +33,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 --non-interactive --agree-tos --email #{fetch(:lets_encrypt_email)} certonly --webroot -w #{current_path}/public #{ Array(fetch(:lets_encrypt_domains)).map{ |d| "-d #{d.gsub(/^\*?\./, "")} -d www.#{d.gsub(/^\*?\./, "")}" }.join(" ") }"
+      execute :sudo, "#{ fetch(:lets_encrypt_path) }/certbot-auto --non-interactive --agree-tos --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
   

metadata

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