+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -144,6 +84,91 @@ Changelog of Git Changelog.
++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Service * manage Nagios service on server @@ -302,7 +304,7 @@ environments.
diff --git a/doc/index.html b/doc/index.html index cae5a69..ae76248 100644 --- a/doc/index.html +++ b/doc/index.html @@ -145,7 +145,9 @@ configure NRPE on clients (optional) * configure selinux policies (optional) * configure forwarding http to https -including accesing the /nagios url directly (optional) +including accesing the /nagios url directly (optional) +* manage TLS +certificates through certbot (optional)Service * manage Nagios service on server @@ -302,7 +304,7 @@ environments.
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 02516ee..ac49e1e 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 ce54145..2cc3d75 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html @@ -186,7 +186,7 @@ class cd_nagios::certbot::config ( unless => template('cd_nagios/certbot/unless_get_cert.erb'), notify => Service['httpd'], creates => '/etc/httpd/conf.d/.cert_created', - } + } # renew certs @@ -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 b879f96..7d2ae7b 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 f51a4bb..596c668 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 e8d073e..800ff61 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -152,7 +152,12 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/. 43 44 45 -46 +46 +47 +48 +49 +50 +51# File 'manifests/main/config.pp', line 24 @@ -173,6 +178,11 @@ class cd_nagios::main::config ( if $ng_use_selinux_tools == true { include cd_nagios::selinux::config } + + if $ng_enable_certbot == true { + include cd_nagios::certbot::config + } + } if $::fqdn != $ng_nagios_server { @@ -187,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 ee2f010..7328045 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 806b849..74acc56 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 bcaf6f4..3051e73 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 ea160d8..69dddff 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -2305,7 +2305,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 92fee8d..dbefd4d 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 e15fb30..1a2818d 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 7894bb0..f2790d8 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 35cb2f0..b7072fd 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 4d4a689..75f2cbb 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 aa02f34..9db8418 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ diff --git a/manifests/certbot/config.pp b/manifests/certbot/config.pp index 3f0c635..3f6e4ab 100644 --- a/manifests/certbot/config.pp +++ b/manifests/certbot/config.pp @@ -39,7 +39,7 @@ class cd_nagios::certbot::config ( unless => template('cd_nagios/certbot/unless_get_cert.erb'), notify => Service['httpd'], creates => '/etc/httpd/conf.d/.cert_created', - } + } # renew certs diff --git a/manifests/main/config.pp b/manifests/main/config.pp index 25adb6d..63f5c2b 100644 --- a/manifests/main/config.pp +++ b/manifests/main/config.pp @@ -37,6 +37,11 @@ class cd_nagios::main::config ( if $ng_use_selinux_tools == true { include cd_nagios::selinux::config } + + if $ng_enable_certbot == true { + include cd_nagios::certbot::config + } + } if $::fqdn != $ng_nagios_server { diff --git a/templates/httpd/nagios_conf.erb b/templates/httpd/nagios_conf.erb index 90bf810..3d1ad3a 100644 --- a/templates/httpd/nagios_conf.erb +++ b/templates/httpd/nagios_conf.erb @@ -37,7 +37,7 @@ ScriptAlias /nagios/cgi-bin/ "/usr/lib64/nagios/cgi-bin/" Allow from <%= @ng_required_hosts %> <% end -%> <% unless @ng_required_ips.empty? -%> - Alloow from <%= @ng_required_ips %> + Allow from <%= @ng_required_ips %> <% end -%> AuthName "Nagios Access" AuthType Basic @@ -77,7 +77,7 @@ Alias /nagios "/usr/share/nagios/html" Allow from <%= @ng_required_hosts %> <% end -%> <% unless @ng_required_ips.empty? -%> - Alloow from <%= @ng_required_ips %> + Allow from <%= @ng_required_ips %> <% end -%> AuthName "Nagios Access" AuthType Basic