From 0a369179b7044614c0ff6ac534b7127961fe380b Mon Sep 17 00:00:00 2001
From: Arne Teuke <arne_teuke@confdroid.com>
Date: Sun, 23 Jul 2017 12:38:08 +0100
Subject: [PATCH] typos

---
 manifests/certbot/certs.pp           | 2 +-
 manifests/params.pp                  | 5 +++--
 templates/httpd/nagios_ssl_vhost.erb | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

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