From 3923a4adc5e44438e7581ca95e84a572ac3e7176 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Fri, 21 Jul 2017 15:51:28 +0100 Subject: [PATCH] changed config to use variables, added parameters --- manifests/certbot/config.pp | 4 ++-- manifests/params.pp | 4 +++- templates/certbot/unless_renew_cert.erb | 7 +++++++ 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 templates/certbot/unless_renew_cert.erb diff --git a/manifests/certbot/config.pp b/manifests/certbot/config.pp index 3f6e4ab..9da5900 100644 --- a/manifests/certbot/config.pp +++ b/manifests/certbot/config.pp @@ -32,7 +32,7 @@ class cd_nagios::certbot::config ( # create cert exec { 'create_cert': - command => template('cd_nagios/certbot/get_cert.erb'), + command => template($ng_get_cert_erb), cwd => '/tmp', path => ['/bin','/usr/bin'], provider => 'shell', @@ -49,7 +49,7 @@ class cd_nagios::certbot::config ( path => ['/bin','/usr/bin','/opt/'], provider => 'shell', notify => Service['httpd'], - unless => template('cd_nagios/certbot/unless_renew_cert.erb'), + unless => template($ng_unless_renew_erb), } } } diff --git a/manifests/params.pp b/manifests/params.pp index 8902987..98fcd38 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -372,7 +372,9 @@ $ng_welcome_conf = '/etc/httpd/conf.d/welcome.conf' $ng_welcome_conf_erb = 'cd_nagios/httpd/welcome_conf.erb' $ng_forward_conf = '/etc/httpd/conf.d/nagios_forward.conf' $ng_forward_conf_erb = 'cd_nagios/httpd/forward_conf.erb' - +$ng_get_cert_erb = 'cd_nagios/certbot/get_cert.erb' +$ng_unless_get_cert = 'cd_nagios/certbot/unless_get_cert.erb' +$ng_unless_renew_erb = 'cd_nagios/certbot/unless_renew_cert.erb' # includes must be last diff --git a/templates/certbot/unless_renew_cert.erb b/templates/certbot/unless_renew_cert.erb new file mode 100644 index 0000000..6ebb22d --- /dev/null +++ b/templates/certbot/unless_renew_cert.erb @@ -0,0 +1,7 @@ +#!/bin/bash +<% if @ng_enable_certbot == true %> +case `find /etc/letsencrypt/renewal -type f -name "<%= @ng_nagios_server %>.conf" -mtime +80` in + '') echo 'No filename found' exit 0 ;; + *) echo 'Found filename' exit 1 ;; +esac +<% end %>