magic_recipes_two 0.0.60 → 0.0.61

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- ZWU1ZTk5ODlhNmNkZWE2NmU2ODg0NDg0MmE3YjA1YTVkNjI4ZWFmNg==
4
+ MzI5ZmZlMmYwYzgwZjllZDBjYTY2MmE4ZjdiYmI2NzM4ZTZmZWJhYQ==
5
5
  data.tar.gz: !binary |-
6
- MDA3ZjJiMmZmNDBhMzNjMTVmYjZiM2Y1MDg5NzQ1ODIwZTJkMmI5MQ==
6
+ NWZhNmQ1YjQ2OWE0NzNhZGNlNWJhZGI5MTBkZDMyNDVhYzQzYzZiMQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- MmU2NjQ5MmNkNWViYjY1MjhjZjRhNmY2MzYyYzBiNjM5OWNiYThlNDFkM2Vm
10
- YWNmOGEwNzIyYTZmNzhkNjQzOTQwMTIwMzMzMmY5ZTRkNjM1ZTJmMTAyYTZj
11
- N2ViZGVmZDU1Nzg1ZWI5ZDMyOTlmYmMwMjJlZGIyZmI3N2U1NjE=
9
+ ZDMxZDVlZGYzODI3ODdjNDkyMmUzNmI4MmU4M2RiMDA5NjM1MDBlY2ZjZGUx
10
+ NGQzNzZlNjJlYmY4NTM5ZmY1ZjJiNmM0ZjZjZjgyNmQ1Y2JlNGMwMjJmMDY4
11
+ ZGFiOWNjZjJmYTA4N2Q5OGQ2ZGJlNzYzYjU0NWNjMDg2ZWMxNjg=
12
12
  data.tar.gz: !binary |-
13
- NGU5YTgxODc5NGJkYjE0ZDRlM2ZlNTk1Y2RkNzUwOTcxYzZjMzE0NTUzOTI0
14
- YjNmMWE3OTIyMjAzMzJmZGRmZjBiMjg4ZmMzODNhODI3MDNjMDY2N2I3ZTI4
15
- NWM1MGJkOTJmMjViYjNmOTBkYzUzOTE3ZGY3MjljYzk2NGM0YWY=
13
+ MGE1Y2U2NDc5NThhZWVlYzY5ODQ0YmU1MjM1OGFjNTkzNWM2NDUzYzMyMjU5
14
+ YWMyNmY2M2NjYzQwMjMyZWZkMmJjMmUxNmFiYTE2ODRiYTU3NzViM2VhNWE5
15
+ YzFlYzBiMTVhYjdjNmM0ZTg3ZjFjMTQzZTZhN2YwMWQ1Y2U5MTY=
@@ -1,5 +1,5 @@
1
1
  module Capistrano
2
2
  module MagicRecipes
3
- VERSION = "0.0.60"
3
+ VERSION = "0.0.61"
4
4
  end
5
5
  end
@@ -5,6 +5,7 @@ namespace :load do
5
5
  task :defaults do
6
6
  set :lets_encrypt_roles, -> { :web }
7
7
  set :lets_encrypt_path, -> { "~" }
8
+ set :lets_encrypt_domains, -> { fetch(:nginx_major_domain,false) ? [fetch(:nginx_major_domain)] + Array(fetch(:nginx_domains)) : Array(fetch(:nginx_domains)) }
8
9
  set :lets_encrypt_renew_minute, -> { "23" }
9
10
  set :lets_encrypt_renew_hour1, -> { "0" }
10
11
  set :lets_encrypt_renew_hour2, -> { "12" }
@@ -29,7 +30,7 @@ namespace :lets_encrypt do
29
30
  task :certonly do
30
31
  on release_roles fetch(:lets_encrypt_roles) do
31
32
  # 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"
32
- 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(" ") }"
33
+ 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(" ") }"
33
34
  end
34
35
  end
35
36
 
@@ -74,6 +74,31 @@ namespace :nginx do
74
74
  end
75
75
  end
76
76
  end
77
+
78
+ desc "check nginx version"
79
+ task :version do
80
+ on release_roles fetch(:nginx_roles) do
81
+ output = capture("nginx -v")
82
+ puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
83
+ output.each_line do |line|
84
+ puts line
85
+ end
86
+ puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
87
+ end
88
+ end
89
+
90
+ desc "check nginx conf"
91
+ task :check_conf do
92
+ nginx_service = fetch(:nginx_service_path)
93
+ on release_roles fetch(:nginx_roles) do
94
+ output = capture(:sudo, "nginx -t")
95
+ puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
96
+ output.each_line do |line|
97
+ puts line
98
+ end
99
+ puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
100
+ end
101
+ end
77
102
 
78
103
  after 'deploy:check', nil do
79
104
  on release_roles fetch(:nginx_roles) do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: magic_recipes_two
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.60
4
+ version: 0.0.61
5
5
  platform: ruby
6
6
  authors:
7
7
  - Torsten Wetzel