tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added missing file parameters to apache module.

Browse source
This commit is contained in:
Ossi Salmi 2009-12-01 16:25:30 +02:00 • committed by Timo Mkinen
parent 0e1976f08c
commit 95d3d822d6
1 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

33
apache/manifests/init.pp
View file

@ -57,6 +57,9 @@ class apache::server inherits apache::common {
file { "/etc/httpd/conf/httpd.conf": file { "/etc/httpd/conf/httpd.conf":
ensure => present, ensure => present,
content => template("apache/httpd.conf.erb"), content => template("apache/httpd.conf.erb"),
mode => 0644,
owner => root,
group => root,
require => Package["httpd"], require => Package["httpd"],
notify => Service["httpd"], notify => Service["httpd"],
} }
@ -123,6 +126,9 @@ define apache::site($root="", $config="") {
file { "/etc/httpd/site.http.d/${site_fqdn}.conf": file { "/etc/httpd/site.http.d/${site_fqdn}.conf":
ensure => present, ensure => present,
mode => 0644,
owner => root,
group => root,
notify => Service["httpd"], notify => Service["httpd"],
} }
@ -163,6 +169,9 @@ class apache::sslserver inherits apache::common {
file { "/etc/httpd/conf/httpsd.conf": file { "/etc/httpd/conf/httpsd.conf":
ensure => present, ensure => present,
mode => 0644,
owner => root,
group => root,
content => template("apache/httpsd.conf.erb"), content => template("apache/httpsd.conf.erb"),
require => Package["httpd"], require => Package["httpd"],
notify => Service["httpsd"], notify => Service["httpsd"],
@ -177,8 +186,9 @@ class apache::sslserver inherits apache::common {
} }
file { "/usr/sbin/httpsd": file { "/usr/sbin/httpsd":
ensure => link, ensure => link,
target => "/usr/sbin/httpd", target => "/usr/sbin/httpd",
require => Package["httpd"],
} }
service { "httpsd": service { "httpsd":
@ -292,6 +302,9 @@ define apache::sslsite($root="", $config="", $ssl_cert="", $ssl_key="", $ssl_cha
file { "/etc/httpd/site.https.d/${site_fqdn}.conf": file { "/etc/httpd/site.https.d/${site_fqdn}.conf":
ensure => present, ensure => present,
mode => 0644,
owner => root,
group => root,
notify => Service["httpsd"], notify => Service["httpsd"],
require => [ File["/etc/pki/tls/certs/${site_fqdn}.crt"], require => [ File["/etc/pki/tls/certs/${site_fqdn}.crt"],
File["/etc/pki/tls/private/${site_fqdn}.key"], ], File["/etc/pki/tls/private/${site_fqdn}.key"], ],
@ -344,10 +357,10 @@ define apache::configfile($source="", $content="", $http=true, $https=true) {
true => present, true => present,
default => absent, default => absent,
}, },
mode => 0644, mode => 0644,
owner => root, owner => root,
group => root, group => root,
notify => Service["httpd"], notify => Service["httpd"],
} }
if $source { if $source {
File["/etc/httpd/conf.http.d/${name}"] { File["/etc/httpd/conf.http.d/${name}"] {
@ -377,10 +390,10 @@ define apache::configfile($source="", $content="", $http=true, $https=true) {
true => present, true => present,
default => absent, default => absent,
}, },
mode => 0644, mode => 0644,
owner => root, owner => root,
group => root, group => root,
notify => Service["httpsd"], notify => Service["httpsd"],
} }
if $source { if $source {
File["/etc/httpd/conf.https.d/${name}"] { File["/etc/httpd/conf.https.d/${name}"] {