magic_recipes_two 0.0.69 → 0.0.70

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
- MmRhZTdmMWZiM2Y2ZjM0YzZjNTUwZDYwYzUxZDdjYmIzYzNlYTQwMw==
4
+ NmFmOTM2NGI0NjU1YTliODY3MWEyZGU1NTczNjFkOGUyYTliMDU1OQ==
5
5
  data.tar.gz: !binary |-
6
- ZGUyMzc2YTdhMmUwYWNhMWM2ODg3NDA1OTQ4MTViOTZmYTZjNzBkYg==
6
+ MTRkMGZjYmUzYzQ2N2MyNWNhYjIxN2NmOTIxNTBiNThjMWEwNGQzMA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- ZDdlOTgxNGU0MDEzMWY0YzZkODE5OWVlYTEwZGFmZmY3YjIxNDZjNWY3ZGU3
10
- NDk2MWM1YTlkZTI3Y2VhOGE1ZjQxNTBlYzA4YmM1NzQzZDhlNGY2NDQ3Yzkw
11
- NjJhMmUyNmVlOTI5NjY2NTVkNDNmNDc1ODViY2QyZDJmZWM0ZGU=
9
+ NmJjNWRmMTZmZWE3ODNiYzg0MmU5ZDRjYTcwNjU5ODllMTM2YjlhZjQxNzc3
10
+ MWFkYzc1Mzk2YmE2ZDM3MTE2YWE3Mzg0NzMxNWFjMjliYWQ1OTFmMWEzOTIw
11
+ MzQwY2EzOWIwOGJjOTYzZTgyYjBkOWIxZmM5ZDdlZjQxNmIxNmE=
12
12
  data.tar.gz: !binary |-
13
- NDZmZTI1MWVkMGUxMTgyNTcwNDNhYWViOGZiNmE2ZWM5NjdlMDQ0ODU0MzJj
14
- MTJmZTVkZDBjMTA0OTYyNmVjY2FjNTUxMzRhZGRmNjZjYmM4NjRhMmUxNTAy
15
- NmEwNzI3YWY2YjVhODk4ZWZhNjRhOGY1MDQ3ZjMzZmE5YWUxNjk=
13
+ YjhjODJiMzc5MDYxYTZjMjc0Y2EwYzdiMDE1MzQ1MGQxY2U2MWE0Yjc5OWRh
14
+ MmVjOGE3MjUyYzg1YjFlZjM1YTQ1MzYyNTEyMjc3MTk0NzBjYTQ1ZDNlNTIy
15
+ NDA1Y2YzMDAyMzJjNTkwYTAxNTExNjE4MTIxZGQ5ZWNkZDM5ZWY=
@@ -1,5 +1,5 @@
1
1
  module Capistrano
2
2
  module MagicRecipes
3
- VERSION = "0.0.69"
3
+ VERSION = "0.0.70"
4
4
  end
5
5
  end
@@ -9,6 +9,7 @@ namespace :load do
9
9
  set :lets_encrypt_renew_minute, -> { "23" }
10
10
  set :lets_encrypt_renew_hour1, -> { "0" }
11
11
  set :lets_encrypt_renew_hour2, -> { "12" }
12
+ set :lets_encrypt_renew_hour, -> { "#{ fetch(:lets_encrypt_renew_hour1) },#{ fetch(:lets_encrypt_renew_hour2) }" }
12
13
  set :lets_encrypt_cron_log, -> { "#{shared_path}/log/lets_encrypt_cron.log" }
13
14
  set :lets_encrypt_email, -> { "ssl@example.com" }
14
15
  end
@@ -27,7 +28,7 @@ namespace :lets_encrypt do
27
28
  end
28
29
 
29
30
 
30
- desc "Install certbot LetsEncrypt"
31
+ desc "Generate LetsEncrypt certificate"
31
32
  task :certonly do
32
33
  on release_roles fetch(:lets_encrypt_roles) do
33
34
  # 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"
@@ -36,12 +37,12 @@ namespace :lets_encrypt do
36
37
  end
37
38
 
38
39
 
39
- desc "Install certbot LetsEncrypt"
40
+ desc "Upload LetsEncrypt cron-job"
40
41
  ## http://serverfault.com/a/825032
41
42
  task :auto_renew do
42
43
  on release_roles fetch(:lets_encrypt_roles) do
43
44
  # 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"
44
- execute :sudo, "echo '#{ fetch(:lets_encrypt_renew_minute) } #{ fetch(:lets_encrypt_renew_hour1) },#{ fetch(:lets_encrypt_renew_hour2) } * * * root #{ fetch(:lets_encrypt_path) }/certbot-auto renew --no-self-upgrade --post-hook \"#{fetch(:nginx_service_path)} restart\" >> #{ fetch(:lets_encrypt_cron_log) } 2>&1' | cat > #{ fetch(:lets_encrypt_path) }/lets_encrypt_cronjob"
45
+ execute :sudo, "echo '#{ fetch(:lets_encrypt_renew_minute) } #{ fetch(:lets_encrypt_renew_hour) } * * * root #{ fetch(:lets_encrypt_path) }/certbot-auto renew --no-self-upgrade --post-hook \"#{fetch(:nginx_service_path)} restart\" >> #{ fetch(:lets_encrypt_cron_log) } 2>&1' | cat > #{ fetch(:lets_encrypt_path) }/lets_encrypt_cronjob"
45
46
  execute :sudo, "mv -f #{ fetch(:lets_encrypt_path) }/lets_encrypt_cronjob /etc/cron.d/lets_encrypt"
46
47
  execute :sudo, "chown -f root:root /etc/cron.d/lets_encrypt"
47
48
  execute :sudo, "chmod -f 0644 /etc/cron.d/lets_encrypt"
@@ -70,6 +71,7 @@ namespace :lets_encrypt do
70
71
  end
71
72
  end
72
73
 
74
+
73
75
  desc "Check CRON logs in syslog"
74
76
  task :check_cron_logs do
75
77
  on release_roles fetch(:lets_encrypt_roles) do
@@ -13,23 +13,26 @@ set mail-format {
13
13
  reply-to: <%= fetch(:monit_mail_reply_to) %>
14
14
  subject: !!! $EVENT on $SERVICE !!!
15
15
  message: $EVENT on $SERVICE - $DESCRIPTION.
16
-
17
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
18
- When: $DATE
19
- What: $EVENT [$ACTION]
20
- Where: $SERVICE
21
- More: $DESCRIPTION
22
- Server: $HOST
23
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
24
-
25
- Your faithful employee,
26
- M O N I T
27
-
28
- <% if fetch(:monit_http_client) %><% if fetch(:monit_http_domain) %>
29
- Web: <%= fetch(:monit_http_use_ssl) ? "https" : "http" %>://<%= fetch(:monit_http_domain) %>:<%= fetch(:monit_http_port) %>/
30
- <% else %>
31
- Web: <%= fetch(:monit_http_use_ssl) ? "https" : "http" %>://<%= fetch(:app_server_ip) %>:<%= fetch(:monit_http_port) %>/
32
- <% end %><% end %>
16
+
17
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
18
+
19
+ Where: $SERVICE
20
+ When: $DATE
21
+ What: $EVENT
22
+ Type: $ACTION
23
+ More: $DESCRIPTION
24
+ Server: $HOST
25
+
26
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
27
+
28
+ Your faithful employee,
29
+ M O N I T
30
+
31
+ <% if fetch(:monit_http_client) %><% if fetch(:monit_http_domain) %>
32
+ Web: <%= fetch(:monit_http_use_ssl) ? "https" : "http" %>://<%= fetch(:monit_http_domain) %>:<%= fetch(:monit_http_port) %>/
33
+ <% else %>
34
+ Web: <%= fetch(:monit_http_use_ssl) ? "https" : "http" %>://<%= fetch(:app_server_ip) %>:<%= fetch(:monit_http_port) %>/
35
+ <% end %><% end %>
33
36
  }
34
37
 
35
38
  set mailserver <%= fetch(:monit_mail_server) %> port <%= fetch(:monit_mail_port) %>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: magic_recipes_two
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.69
4
+ version: 0.0.70
5
5
  platform: ruby
6
6
  authors:
7
7
  - Torsten Wetzel
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-09-05 00:00:00.000000000 Z
11
+ date: 2017-10-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails