diff --git a/CHANGELOG.md b/CHANGELOG.md index 3535b89..4344004 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+8085b97daed7ce4 Jenkins Server 2017-07-23 11:28:03 +

+

recommit for updates in build 59

+ +

+da29fe89ef8469e Arne Teuke 2017-07-23 11:27:50 +

+

typos

+ +

2810fd55ebcfd00 Jenkins Server 2017-07-23 11:22:21

recommit for updates in build 58

diff --git a/doc/_index.html b/doc/_index.html index 0d91aa2..d29529a 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 c955732..cacf993 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -326,7 +326,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index b9ce3be..a7ce715 100644 --- a/doc/index.html +++ b/doc/index.html @@ -326,7 +326,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 7c98980..4ddd251 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_3Acerts.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html index 35e0b8e..bb49461 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html +++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html @@ -202,7 +202,7 @@ class cd_nagios::certbot::certs ( provider => 'shell', unless => template('cd_nagios/certbot/unless_get_cert.erb'), notify => Service['httpd'], - creates => $ng_certbot_cert, + creates => $ng_certbot_check, } # renew certs @@ -230,7 +230,7 @@ class cd_nagios::certbot::certs ( 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 6cfb4d3..453d6a9 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 a73354d..6c091dc 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 c908fc2..432fc5c 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -195,7 +195,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 54832c2..e8c60ae 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 63f559b..f40ce82 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 9560e59..862bc8b 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 f0e513d..95dbf5e 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -1881,12 +1881,14 @@ certificate management

  • - ng_certbot_cert_path + ng_certbot_webroot (string) + (defaults to: '/var/www/html') + —
    @@ -1960,19 +1962,6 @@ required for certbot and used in the web templates.

    • -
  • - - ng_certbot_webroot - - - (Any) - - - (defaults to: '/var/www/html') - - -
    • - @@ -2171,7 +2160,8 @@ required for certbot and used in the web templates.

    394 395 396 -397 +397 +398 
    # File 'manifests/params.pp', line 216
@@ -2350,7 +2340,8 @@ $ng_ssl_vhost_erb     = 'cd_nagios/httpd/nagios_ssl_vhost.erb'
 # certbot
 $ng_certbot_main_dir  = '/etc/letsencrypt'
 $ng_certbot_archive   = "${ng_certbot_main_dir}/archive"
-$ng_certbot_cert      = "${ng_certbot_archive}/${ng_webserver_name}/cert1.pem"
+$ng_certbot_check     = "${ng_certbot_archive}/${ng_webserver_name}/cert1.pem"
+$ng_certbot_live      = "${ng_certbot_main_dir}/live"
 
 
 # includes must be last
@@ -2365,7 +2356,7 @@ $ng_certbot_cert      = "${ng_certbot_archive}/${ng_webserver_name}/cert1.p
 
 
       
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 803da67..70b7a07 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 cf62582..bc354be 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 6a671d6..94cd700 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -374,7 +374,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 c760cc0..7e6fe7c 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 a527149..08cc742 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 4e91c31..1b63a0f 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       
diff --git a/manifests/certbot/certs.pp b/manifests/certbot/certs.pp
index b425a24..38ca518 100644
--- a/manifests/certbot/certs.pp
+++ b/manifests/certbot/certs.pp
@@ -44,7 +44,7 @@ class cd_nagios::certbot::certs (
           provider  =>  'shell',
           unless    =>  template('cd_nagios/certbot/unless_get_cert.erb'),
           notify    =>  Service['httpd'],
-          creates   =>  $ng_certbot_cert,
+          creates   =>  $ng_certbot_check,
         }
 
         # renew certs
diff --git a/manifests/params.pp b/manifests/params.pp
index ba47b10..6c251fe 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -202,7 +202,7 @@
 #   If you want no restriction, choose '0.0.0.0/0'
 # @param [boolean]  ng_enable_certbot Whether to use certbot for automated TLS
 #   certificate management
-# @param  [string]  ng_certbot_cert_path the path for certbot to place
+# @param  [string]  ng_certbot_webroot the path for certbot to place
 #   challenges for the certification process.
 # @param  [string] ng_mail_user email address to receive administrative mail.
 #   used for nagios itself as well as for certbot.
@@ -387,7 +387,8 @@ $ng_ssl_vhost_erb     = 'cd_nagios/httpd/nagios_ssl_vhost.erb'
 # certbot
 $ng_certbot_main_dir  = '/etc/letsencrypt'
 $ng_certbot_archive   = "${ng_certbot_main_dir}/archive"
-$ng_certbot_cert      = "${ng_certbot_archive}/${ng_webserver_name}/cert1.pem"
+$ng_certbot_check     = "${ng_certbot_archive}/${ng_webserver_name}/cert1.pem"
+$ng_certbot_live      = "${ng_certbot_main_dir}/live"
 
 
 # includes must be last
diff --git a/templates/httpd/nagios_ssl_vhost.erb b/templates/httpd/nagios_ssl_vhost.erb
index 830a0a8..04f94c8 100644
--- a/templates/httpd/nagios_ssl_vhost.erb
+++ b/templates/httpd/nagios_ssl_vhost.erb
@@ -18,9 +18,9 @@
     SSLCipherSuite "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 EECDH EDH+aRSA RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS !RC4"
 
 <% if @ng_enable_certbot == true -%>
-    SSLCertificateFile <%= @js_certbot_live %>/<%= @ng_webserver_name %>/cert.pem
-    SSLCertificateKeyFile <%= @js_certbot_live %>/<%= @ng_webserver_name %>/privkey.pem
-    SSLCACertificateFile <%= @js_certbot_live %>/<%= @ng_webserver_name %>/fullchain.pem
+    SSLCertificateFile <%= @ng_certbot_live %>/<%= @ng_webserver_name %>/cert.pem
+    SSLCertificateKeyFile <%= @ng_certbot_live %>/<%= @ng_webserver_name %>/privkey.pem
+    SSLCACertificateFile <%= @ng_certbot_live %>/<%= @ng_webserver_name %>/fullchain.pem
 <% elsif @ng_enable_certbot != true -%>
     SSLCertificateFile /etc/pki/tls/certs/localhost.crt
     SSLCertificateKeyFile /etc/pki/tls/private/localhost.key