diff options
| -rw-r--r-- | modules/mail/manifests/monitoring.pp | 1 | ||||
| -rw-r--r-- | modules/tick/files/plugins/certbot_inner | 22 |
2 files changed, 15 insertions, 8 deletions
diff --git a/modules/mail/manifests/monitoring.pp b/modules/mail/manifests/monitoring.pp index fa82a38..241e0d9 100644 --- a/modules/mail/manifests/monitoring.pp +++ b/modules/mail/manifests/monitoring.pp @@ -3,6 +3,7 @@ class mail::monitoring { class { [ + "tick::client::plugin::certbot", "tick::client::plugin::fail2ban", ]: } diff --git a/modules/tick/files/plugins/certbot_inner b/modules/tick/files/plugins/certbot_inner index 5d31c35..8ee355a 100644 --- a/modules/tick/files/plugins/certbot_inner +++ b/modules/tick/files/plugins/certbot_inner @@ -2,13 +2,19 @@ require 'openssl' -config_dir = "/media/persistent/certbot" +config_dirs = [ + "/media/persistent/certbot", + "/media/persistent/certs/letsencrypt", +] -(Dir.entries("#{config_dir}/live/") - [".", ".."]).each do |site| - next unless File.directory?("#{config_dir}/live/#{site}") - cert = File.read("#{config_dir}/live/#{site}/cert.pem") - x509 = OpenSSL::X509::Certificate.new(cert) - days = (x509.not_after - Time.now) / 60 / 60 / 24 - sanitized_site = site.gsub(/[^a-zA-Z0-9]/, '_') - puts "certbot,site=#{sanitized_site} days_remaining=#{days}" +config_dirs.each do |config_dir| + next unless Dir.exists?(config_dir) + (Dir.entries("#{config_dir}/live/") - [".", ".."]).each do |site| + next unless File.directory?("#{config_dir}/live/#{site}") + cert = File.read("#{config_dir}/live/#{site}/cert.pem") + x509 = OpenSSL::X509::Certificate.new(cert) + days = (x509.not_after - Time.now) / 60 / 60 / 24 + sanitized_site = site.gsub(/[^a-zA-Z0-9]/, '_') + puts "certbot,site=#{sanitized_site} days_remaining=#{days}" + end end |