confdroid/confdroid_nagios
3
0
Fork 0
Code Issues Projects Wiki Activity

removing all final config files on certbot level

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/certbot/config.pp
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

111
manifests/server/files.pp
View File

@@ -25,49 +25,36 @@ 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_enable_certbot == true { if $ng_use_https == true {
require cd_nagios::certbot::config if $ng_enable_certbot == true {
require cd_nagios::main::dirs
# manage nagios.cfg require cd_nagios::certbot::config
require cd_nagios::main::dirs
# manage nagios.cfg
# manage cgi.cfg # manage cgi.cfg
file { $ng_cgi_cfg_file: file { $ng_cgi_cfg_file:
ensure => file,
path => $ng_cgi_cfg_file,
owner => 'root',
group => 'root',
mode => '0644',
selrange => s0,
selrole => object_r,
seltype => nagios_etc_t,
seluser => system_u,
content => template($ng_cgi_cfg_erb),
notify => Service[$ng_service],
}
# manage nagios.conf for httpd
file { $ng_nagios_conf:
ensure => file,
path => $ng_nagios_conf,
owner => 'root',
group => 'root',
mode => '0644',
selrange => s0,
selrole => object_r,
seltype => httpd_config_t,
seluser => system_u,
content => template($ng_nagios_conf_erb),
notify => Service[$ae_service],
}
if $ng_http_https_fw == true {
file { $ng_forward_conf:
ensure => file, ensure => file,
path => $ng_forward_conf, path => $ng_cgi_cfg_file,
owner => 'root',
group => 'root',
mode => '0644',
selrange => s0,
selrole => object_r,
seltype => nagios_etc_t,
seluser => system_u,
content => template($ng_cgi_cfg_erb),
notify => Service[$ng_service],
}
# manage nagios.conf for httpd
file { $ng_nagios_conf:
ensure => file,
path => $ng_nagios_conf,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0644', mode => '0644',
@@ -75,26 +62,42 @@ class cd_nagios::server::files (
selrole => object_r, selrole => object_r,
seltype => httpd_config_t, seltype => httpd_config_t,
seluser => system_u, seluser => system_u,
content => template($ng_forward_conf_erb), content => template($ng_nagios_conf_erb),
notify => Service[$ae_service], notify => Service[$ae_service],
} }
}
# manage welcome.conf for nagios web server if $ng_http_https_fw == true {
file { $ng_forward_conf:
ensure => file,
path => $ng_forward_conf,
owner => 'root',
group => 'root',
mode => '0644',
selrange => s0,
selrole => object_r,
seltype => httpd_config_t,
seluser => system_u,
content => template($ng_forward_conf_erb),
notify => Service[$ae_service],
}
}
if $ng_disable_welcome == true { # manage welcome.conf for nagios web server
file { $ng_welcome_conf:
ensure => file, if $ng_disable_welcome == true {
path => $ng_welcome_conf, file { $ng_welcome_conf:
owner => 'root', ensure => file,
group => 'root', path => $ng_welcome_conf,
mode => '0644', owner => 'root',
selrange => s0, group => 'root',
selrole => object_r, mode => '0644',
seltype => httpd_config_t, selrange => s0,
seluser => system_u, selrole => object_r,
content => template($ng_welcome_conf_erb), seltype => httpd_config_t,
notify => Service[$ae_service], seluser => system_u,
content => template($ng_welcome_conf_erb),
notify => Service[$ae_service],
}
} }
} }
} }