Improved checking of included http and https server.

This commit is contained in:
Timo Mkinen 2012-06-13 12:09:16 +03:00
parent 34177b723a
commit a3b6071afb

View file

@ -310,7 +310,7 @@ define apache::redhat::sslsite($ipaddr, $root, $ssl_cert, $ssl_key, $ssl_chain)
define apache::redhat::configfile($source, $content, $http, $https) {
if defined(Service["httpd"]) {
if defined(Class["apache::server"]) {
file { "/etc/httpd/conf.http.d/${name}":
ensure => $http ? {
true => present,
@ -343,7 +343,7 @@ define apache::redhat::configfile($source, $content, $http, $https) {
}
}
if defined(Service["httpsd"]) {
if defined(Class["apache::sslserver"]) {
file { "/etc/httpd/conf.https.d/${name}":
ensure => $https ? {
true => present,