diff --git a/CHANGELOG.md b/CHANGELOG.md index cd63d5e..3679f7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,21 @@ Changelog of Git Changelog.

No issue

+5d8c5cff034540a Jenkins Server 2017-07-21 16:28:39 +

+

recommit for updates in build 42

+ +

+72d40463456586a Arne Teuke 2017-07-21 16:28:18 +

+

working with certbot still

+ +

+0a36dcedf351d57 Arne Teuke 2017-07-21 16:22:31 +

+

fixed seltype

+ +

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

recommit for updates in build 41

diff --git a/doc/_index.html b/doc/_index.html index d46ff75..4f9547e 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 2028b85..45b3003 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 ba4450a..33f3710 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 03066b4..a17e2f3 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 14774e4..e7ee00d 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Aconfig.html @@ -187,7 +187,22 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

78 79 80 -81 +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +91 +92 +93 +94 +95 +96
# File 'manifests/certbot/config.pp', line 23
@@ -219,6 +234,14 @@ class cd_nagios::certbot::config (
           command   =>  "rm -Rf ${ng_index_html_file}",
           creates   =>  '/etc/httpd/conf.d/.cert_created',
           require   =>  Exec['remove_nagios_conf'],
+          notify    =>  Service[$ae_service],
+        }
+
+        exec { 'disable_selinux_temporarily':
+          command   =>  'setenforce 0',
+          path      =>  ['/usr/sbin'],
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['remove_index_html'],
         }
 
         # create cert
@@ -233,6 +256,13 @@ class cd_nagios::certbot::config (
           creates   =>  '/etc/httpd/conf.d/.cert_created',
         }
 
+        exec { 'enable_selinux':
+          command   =>  'setenforce 1',
+          path      =>  ['/usr/sbin'],
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['create_cert'],
+        }
+
         # renew certs
 
         exec {  'renew_cert':
@@ -258,7 +288,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 72800ad..dbd5992 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 c3fdc9f..e8070f8 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 be31052..4bad3fd 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 94a2f23..a67d72e 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 f0c780f..ed90bb6 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 b746db1..61b8ad7 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 c44dccc..0320b58 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 46242ad..ab6e44d 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 59ce5e5..d1cfc0d 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 adb1f49..ce6f5c5 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -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 72a1982..0904a2b 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 37a0d6a..ec6c185 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 9f40ac5..47d404a 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 fa706b1..aab638c 100644
--- a/manifests/certbot/config.pp
+++ b/manifests/certbot/config.pp
@@ -47,6 +47,14 @@ class cd_nagios::certbot::config (
           command   =>  "rm -Rf ${ng_index_html_file}",
           creates   =>  '/etc/httpd/conf.d/.cert_created',
           require   =>  Exec['remove_nagios_conf'],
+          notify    =>  Service[$ae_service],
+        }
+
+        exec { 'disable_selinux_temporarily':
+          command   =>  'setenforce 0',
+          path      =>  ['/usr/sbin'],
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['remove_index_html'],
         }
 
         # create cert
@@ -61,6 +69,13 @@ class cd_nagios::certbot::config (
           creates   =>  '/etc/httpd/conf.d/.cert_created',
         }
 
+        exec { 'enable_selinux':
+          command   =>  'setenforce 1',
+          path      =>  ['/usr/sbin'],
+          creates   =>  '/etc/httpd/conf.d/.cert_created',
+          require   =>  Exec['create_cert'],
+        }
+
         # renew certs
 
         exec {  'renew_cert':