From 3923a4adc5e44438e7581ca95e84a572ac3e7176 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Fri, 21 Jul 2017 15:51:28 +0100 Subject: [PATCH 1/2] 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 %> From 2c6b5f8656e9fefbd19f24b8e9efa30fb0e7177a Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 21 Jul 2017 16:51:54 +0200 Subject: [PATCH 2/2] recommit for updates in build 34 --- CHANGELOG.md | 15 +++++++++++++++ REPOSTRUCTURE.md | 5 +++-- doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nagios.html | 2 +- .../cd_nagios_3A_3Acertbot_3A_3Aconfig.html | 6 +++--- .../cd_nagios_3A_3Aclient_3A_3Atarget.html | 2 +- .../cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 10 +++++++--- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 20 files changed, 44 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2f021b..0bc8730 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,21 @@ Changelog of Git Changelog.

No issue

+353e7e99cf92594 Jenkins Server 2017-07-21 14:42:28 +

+

recommit for updates in build 33

+ +

+e6b974ad08de5d5 Arne Teuke 2017-07-21 14:40:41 +

+

fixed typo

+ +

+c2f38a68165529b Arne Teuke 2017-07-21 14:38:51 +

+

added and linked certbot

+ +

4d4f5636b803d9e Jenkins Server 2017-07-21 14:34:25

recommit for updates in build 30

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 2750e87..09b92c5 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -55,7 +55,8 @@ |-- templates | |-- certbot | | |-- get_cert.erb -| | `-- unless_get_cert.erb +| | |-- unless_get_cert.erb +| | `-- unless_renew_cert.erb | |-- httpd | | |-- forward_conf.erb | | |-- nagios_conf.erb @@ -76,4 +77,4 @@ |-- README.md `-- REPOSTRUCTURE.md -18 directories, 58 files +18 directories, 59 files diff --git a/doc/_index.html b/doc/_index.html index cc69729..3acb26f 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -186,7 +186,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 1032b6d..afa5949 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -304,7 +304,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index ae76248..dff6c49 100644 --- a/doc/index.html +++ b/doc/index.html @@ -304,7 +304,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index ac49e1e..ccb2727 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html index 2cc3d75..4dbfa58 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html @@ -179,7 +179,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', @@ -196,7 +196,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), } } } @@ -208,7 +208,7 @@ class cd_nagios::certbot::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html index 7d2ae7b..f5ceb15 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html @@ -368,7 +368,7 @@ class cd_nagios::client::target ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index 596c668..01309fa 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index 800ff61..a6179c4 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -197,7 +197,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index 7328045..63e1d00 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index 74acc56..b850153 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -235,7 +235,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index 3051e73..1c7f136 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index 69dddff..38826e2 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -2124,7 +2124,9 @@ well as for certbot.

378 379 380 -381 +381 +382 +383 
# File 'manifests/params.pp', line 213
@@ -2291,7 +2293,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
 
@@ -2305,7 +2309,7 @@ $ng_forward_conf_erb  = 'cd_nagios/httpd/forward_conf.erb'
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index dbefd4d..b114d14 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index 1a2818d..d440991 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index f2790d8..2307339 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -300,7 +300,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index b7072fd..bf2038b 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -174,7 +174,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
index 75f2cbb..dabcfee 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -220,7 +220,7 @@ $ng_service       = $::cd_nagios::params::ng_service
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 9db8418..a3baa7c 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@