Purge unmanaged files from managed configuration directories.

This commit is contained in:
Ossi Salmi 2010-02-19 15:34:36 +02:00 committed by Timo Mkinen
parent ced754f674
commit dc761f2a38
4 changed files with 26 additions and 4 deletions

View file

@ -61,13 +61,20 @@ class apache::server inherits apache::common {
"/srv/www/log/http",
"/srv/www/log/http/${fqdn}", ]:
ensure => directory,
mode => 0755,
mode => 0644,
owner => root,
group => root,
require => Package["httpd"],
before => File["/etc/httpd/conf/httpd.conf"],
}
File["/etc/httpd/conf.http.d", "/etc/httpd/site.http.d"] {
purge => true,
force => true,
recurse => true,
source => "puppet:///custom/empty",
}
file { "/etc/httpd/conf/httpd.conf":
ensure => present,
content => template("apache/httpd.conf.erb"),
@ -205,13 +212,20 @@ class apache::sslserver inherits apache::common {
"/srv/www/log/https",
"/srv/www/log/https/${fqdn}", ]:
ensure => directory,
mode => 0755,
mode => 0644,
owner => root,
group => root,
require => Package["httpd"],
before => File["/etc/httpd/conf/httpsd.conf"],
}
File["/etc/httpd/conf.https.d", "/etc/httpd/site.https.d"] {
purge => true,
force => true,
recurse => true,
source => "puppet:///custom/empty",
}
file { "/etc/httpd/conf/httpsd.conf":
ensure => present,
mode => 0644,