From 0a36dcedf351d576d842055c3df580c3a130dce6 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Fri, 21 Jul 2017 17:22:31 +0100 Subject: [PATCH 1/3] fixed seltype --- manifests/server/files.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/server/files.pp b/manifests/server/files.pp index 411022e..75cf691 100644 --- a/manifests/server/files.pp +++ b/manifests/server/files.pp @@ -114,7 +114,7 @@ class cd_nagios::server::files ( mode => '0644', selrange => s0, selrole => object_r, - seltype => httpd_config_t, + seltype => httpd_sys_content_t, seluser => system_u, content => template($ng_index_html_erb), notify => Service[$ae_service], From 72d40463456586a6f9845de8038343608b98572a Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Fri, 21 Jul 2017 17:28:18 +0100 Subject: [PATCH 2/3] working with certbot still --- manifests/certbot/config.pp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/manifests/certbot/config.pp b/manifests/certbot/config.pp index f744277..fa706b1 100644 --- a/manifests/certbot/config.pp +++ b/manifests/certbot/config.pp @@ -30,6 +30,25 @@ class cd_nagios::certbot::config ( require cd_certbot + # ensure there is no forward vhost file + + exec { 'remove_forward_vhost': + command => "rm -Rf ${ng_forward_conf}", + creates => '/etc/httpd/conf.d/.cert_created', + } + + exec { 'remove_nagios_conf': + command => "rm -Rf ${ng_nagios_conf}", + creates => '/etc/httpd/conf.d/.cert_created', + require => Exec['remove_forward_vhost'], + } + + exec { 'remove_index_html': + command => "rm -Rf ${ng_index_html_file}", + creates => '/etc/httpd/conf.d/.cert_created', + require => Exec['remove_nagios_conf'], + } + # create cert exec { 'create_cert': From 5d8c5cff034540ae55ba64ffae9e64cf6bc34863 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 21 Jul 2017 18:28:39 +0200 Subject: [PATCH 3/3] recommit for updates in build 42 --- CHANGELOG.md | 10 +++++ 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 | 42 ++++++++++++++++++- .../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 | 2 +- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 4 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 19 files changed, 68 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1684a86..cd63d5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+d70df7efcba20a6 Jenkins Server 2017-07-21 16:15:13 +

+

recommit for updates in build 41

+ +

+910a2e4fb87c5b3 Arne Teuke 2017-07-21 16:14:54 +

+

fixed relationship

+ +

7fff54ce74927d9 Jenkins Server 2017-07-21 16:11:57

recommit for updates in build 40

diff --git a/doc/_index.html b/doc/_index.html index 64536e0..d46ff75 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 6326b2a..2028b85 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 1dcb907..ba4450a 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 4d31580..03066b4 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 10b43df..14774e4 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html @@ -168,7 +168,26 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

59 60 61 -62 +62 +63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 
# File 'manifests/certbot/config.pp', line 23
@@ -183,6 +202,25 @@ class cd_nagios::certbot::config (
 
         require cd_certbot
 
+        # ensure there is no forward vhost file
+
+        exec { 'remove_forward_vhost':
+          command   =>  "rm -Rf ${ng_forward_conf}",
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+        }
+
+        exec { 'remove_nagios_conf':
+          command   =>  "rm -Rf ${ng_nagios_conf}",
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['remove_forward_vhost'],
+        }
+
+        exec { 'remove_index_html':
+          command   =>  "rm -Rf ${ng_index_html_file}",
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['remove_nagios_conf'],
+        }
+
         # create cert
 
         exec { 'create_cert':
@@ -220,7 +258,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 4a14192..72800ad 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 8b663dc..c3fdc9f 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 cd3b54f..be31052 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html
@@ -187,7 +187,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 fe039de..94a2f23 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 9170704..f0c780f 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 60ae67c..b746db1 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 62d693e..c44dccc 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -2312,7 +2312,7 @@ $ng_index_html_erb    = 'cd_nagios/httpd/index_html.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 9c4a4d9..46242ad 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 3304267..59ce5e5 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 7a71794..adb1f49 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -329,7 +329,7 @@ class cd_nagios::server::files (
         mode      =>  '0644',
         selrange  =>  s0,
         selrole   =>  object_r,
-        seltype   =>  httpd_config_t,
+        seltype   =>  httpd_sys_content_t,
         seluser   =>  system_u,
         content   =>  template($ng_index_html_erb),
         notify    =>  Service[$ae_service],
@@ -344,7 +344,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 fece172..72a1982 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 fe608fc..37a0d6a 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 6b0ed0c..9f40ac5 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@