removing all final config files on certbot level

This commit is contained in:
Arne Teuke
2017-07-21 16:46:40 +01:00
parent 8db53dcf33
commit 09372f6865
2 changed files with 64 additions and 55 deletions

View File

@@ -37,6 +37,12 @@ class cd_nagios::certbot::config (
creates => '/etc/httpd/conf.d/.cert_created', 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'],
}
# create temp vhost file # create temp vhost file
exec { 'create_temp_vhost': exec { 'create_temp_vhost':
@@ -46,7 +52,7 @@ class cd_nagios::certbot::config (
provider => 'shell', provider => 'shell',
creates => '/etc/httpd/conf.d/.created', creates => '/etc/httpd/conf.d/.created',
notify => Service['httpd'], notify => Service['httpd'],
require => Exec['remove_forward_vhost'], require => Exec['remove_nagios_conf'],
} }
# create cert # create cert

View File

@@ -25,7 +25,9 @@ class cd_nagios::server::files (
) inherits cd_nagios::params { ) inherits cd_nagios::params {
if $::fqdn == $ng_nagios_server { if $::fqdn == $ng_nagios_server {
if $ng_use_https == true {
if $ng_enable_certbot == true { if $ng_enable_certbot == true {
require cd_nagios::certbot::config require cd_nagios::certbot::config
require cd_nagios::main::dirs require cd_nagios::main::dirs
@@ -98,6 +100,7 @@ class cd_nagios::server::files (
} }
} }
} }
}
else { else {