From c2f38a68165529bfd2bf2adc830c60cb1725bb92 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Fri, 21 Jul 2017 15:38:51 +0100 Subject: [PATCH 1/3] added and linked certbot --- README.md | 1 + manifests/certbot/config.pp | 2 +- manifests/main/config.pp | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 34580ae..6bf0ba9 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,7 @@ Configuration * configure firewall (optional) * configure selinux policies (optional) * configure forwarding http to https including accesing the /nagios url directly (optional) +* manage TLS certificates through certbot (optional) Service * manage Nagios service on server 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 { From e6b974ad08de5d547ee54ecd7ece680ea3c55b2d Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Fri, 21 Jul 2017 15:40:41 +0100 Subject: [PATCH 2/3] fixed typo --- templates/httpd/nagios_conf.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 353e7e99cf9259475fb8446971d911307731c0d5 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 21 Jul 2017 16:42:28 +0200 Subject: [PATCH 3/3] recommit for updates in build 33 --- CHANGELOG.md | 165 ++++++++++-------- REPOSTRUCTURE.md | 3 +- doc/_index.html | 2 +- doc/file.README.html | 6 +- doc/index.html | 6 +- doc/puppet_classes/cd_nagios.html | 2 +- .../cd_nagios_3A_3Acertbot_3A_3Aconfig.html | 4 +- .../cd_nagios_3A_3Aclient_3A_3Atarget.html | 2 +- ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 14 +- .../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 | 2 +- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- ..._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, 133 insertions(+), 93 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1814ec0..d2f021b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,105 +8,45 @@ Changelog of Git Changelog.

No issue

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

+

recommit for updates in build 30

+ +

+2543121abaf145b Arne Teuke 2017-07-21 14:33:05 +

+

added certbot section

+ +

60407116a503868 Jenkins Server 2017-07-21 13:47:34

recommit for updates in build 27

-

-409ec084543f0d8 Arne Teuke 2017-07-21 13:47:12 -

-

added control for forward.conf

-

1fc9ffeacdebd20 Jenkins Server 2017-07-21 13:43:26

recommit for updates in build 26

-

-d9863d874f0b88f Arne Teuke 2017-07-21 13:43:07 -

-

added control for forward.conf

-

00ef7138b378bf5 Jenkins Server 2017-07-21 13:06:15

recommit for updates in build 25

-

-46d3b02f7625b15 Arne Teuke 2017-07-21 13:05:55 -

-

added control for welcome.conf

-

4ec7633f976a225 Jenkins Server 2017-07-21 12:51:33

recommit for updates in build 24

-

-5d12bf44374b934 Arne Teuke 2017-07-21 12:51:07 -

-

found format options both for hosts and ips

- -

-442fd08f623728f Arne Teuke 2017-07-21 12:44:03 -

-

testing options both for hosts and ips

- -

-b95350b8d8e58b4 Arne Teuke 2017-07-21 12:41:33 -

-

testing options both for hosts and ips

- -

-a28f890bdde57e2 Arne Teuke 2017-07-21 12:30:09 -

-

testing options both for hosts and ips

- -

-de3a7fd4fa01415 Arne Teuke 2017-07-21 12:20:44 -

-

testing options both for hosts and ips

- -

-b37864c7a366aff Arne Teuke 2017-07-21 12:15:47 -

-

testing options both for hosts and ips

-

109eea2716be3ae Jenkins Server 2017-07-21 11:35:04

recommit for updates in build 18

-

-5de81e818498830 Arne Teuke 2017-07-21 11:34:48 -

-

testing options both for hosts and ips

- -

-41434c9607ab037 Arne Teuke 2017-07-21 11:28:50 -

-

adding options both for hosts and ips

- -

-544f48d800ad39a Arne Teuke 2017-07-21 11:21:12 -

-

adding options both for hosts and ips

-

969e377d5db6423 Jenkins Server 2017-07-21 11:06:59

recommit for updates in build 15

-

-e402224ff9bb367 Arne Teuke 2017-07-21 11:06:36 -

-

trying empty array

- -

-49551a3d9af3460 Arne Teuke 2017-07-21 10:43:06 -

-

included control for nagios.conf

-

05036af24182601 Jenkins Server 2017-07-20 16:26:40

@@ -144,6 +84,91 @@ Changelog of Git Changelog.

+

v0.0.0.8

+

No issue

+ + +e160b3f919967bc Arne Teuke 2017-07-21 14:03:09 +

+

finished nagios.conf

+ +

+5311e868eec2343 Arne Teuke 2017-07-21 13:57:05 +

+

chenged forwarding to allow http as well too

+ +

+409ec084543f0d8 Arne Teuke 2017-07-21 13:47:12 +

+

added control for forward.conf

+ +

+d9863d874f0b88f Arne Teuke 2017-07-21 13:43:07 +

+

added control for forward.conf

+ +

+46d3b02f7625b15 Arne Teuke 2017-07-21 13:05:55 +

+

added control for welcome.conf

+ +

+5d12bf44374b934 Arne Teuke 2017-07-21 12:51:07 +

+

found format options both for hosts and ips

+ +

+442fd08f623728f Arne Teuke 2017-07-21 12:44:03 +

+

testing options both for hosts and ips

+ +

+b95350b8d8e58b4 Arne Teuke 2017-07-21 12:41:33 +

+

testing options both for hosts and ips

+ +

+a28f890bdde57e2 Arne Teuke 2017-07-21 12:30:09 +

+

testing options both for hosts and ips

+ +

+de3a7fd4fa01415 Arne Teuke 2017-07-21 12:20:44 +

+

testing options both for hosts and ips

+ +

+b37864c7a366aff Arne Teuke 2017-07-21 12:15:47 +

+

testing options both for hosts and ips

+ +

+5de81e818498830 Arne Teuke 2017-07-21 11:34:48 +

+

testing options both for hosts and ips

+ +

+41434c9607ab037 Arne Teuke 2017-07-21 11:28:50 +

+

adding options both for hosts and ips

+ +

+544f48d800ad39a Arne Teuke 2017-07-21 11:21:12 +

+

adding options both for hosts and ips

+ +

+e402224ff9bb367 Arne Teuke 2017-07-21 11:06:36 +

+

trying empty array

+ +

+49551a3d9af3460 Arne Teuke 2017-07-21 10:43:06 +

+

included control for nagios.conf

+ +

+

v0.0.0.7

No issue

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 055e76b..2750e87 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -9,6 +9,7 @@ | | |-- full_list.js | | `-- jquery.js | |-- puppet_classes +| | |-- cd_nagios_3A_3Acertbot_3A_3Aconfig.html | | |-- cd_nagios_3A_3Aclient_3A_3Atarget.html | | |-- cd_nagios_3A_3Afirewall_3A_3Aiptables.html | | |-- cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -75,4 +76,4 @@ |-- README.md `-- REPOSTRUCTURE.md -18 directories, 57 files +18 directories, 58 files diff --git a/doc/_index.html b/doc/_index.html index 7386db1..cc69729 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 c8e1439..1032b6d 100644 --- a/doc/file.README.html +++ b/doc/file.README.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/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 @@