From 95d3d822d6309a766c5c13a1a7fb543392b8031c Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@panoulu.net>
Date: Tue, 1 Dec 2009 16:25:30 +0200
Subject: [PATCH] Added missing file parameters to apache module.

---
 apache/manifests/init.pp | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/apache/manifests/init.pp b/apache/manifests/init.pp
index 688a935..2f172d7 100644
--- a/apache/manifests/init.pp
+++ b/apache/manifests/init.pp
@@ -57,6 +57,9 @@ class apache::server inherits apache::common {
     file { "/etc/httpd/conf/httpd.conf":
         ensure  => present,
         content => template("apache/httpd.conf.erb"),
+        mode    => 0644,
+        owner   => root,
+        group   => root,
         require => Package["httpd"],
         notify  => Service["httpd"],
     }
@@ -123,6 +126,9 @@ define apache::site($root="", $config="") {
 
     file { "/etc/httpd/site.http.d/${site_fqdn}.conf":
         ensure => present,
+        mode   => 0644,
+        owner  => root,
+        group  => root,
         notify => Service["httpd"],
     }
 
@@ -163,6 +169,9 @@ class apache::sslserver inherits apache::common {
 
     file { "/etc/httpd/conf/httpsd.conf":
         ensure  => present,
+        mode    => 0644,
+        owner   => root,
+        group   => root,
         content => template("apache/httpsd.conf.erb"),
         require => Package["httpd"],
         notify  => Service["httpsd"],
@@ -177,8 +186,9 @@ class apache::sslserver inherits apache::common {
     }
 
     file { "/usr/sbin/httpsd":
-        ensure => link,
-        target => "/usr/sbin/httpd",
+        ensure  => link,
+        target  => "/usr/sbin/httpd",
+        require => Package["httpd"],
     }
 
     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":
         ensure  => present,
+        mode    => 0644,
+        owner   => root,
+        group   => root,
         notify  => Service["httpsd"],
         require => [ File["/etc/pki/tls/certs/${site_fqdn}.crt"],
                      File["/etc/pki/tls/private/${site_fqdn}.key"], ],
@@ -344,10 +357,10 @@ define apache::configfile($source="", $content="", $http=true, $https=true) {
                 true    => present,
                 default => absent,
             },
-            mode    => 0644,
-            owner   => root,
-            group   => root,
-            notify  => Service["httpd"],
+            mode   => 0644,
+            owner  => root,
+            group  => root,
+            notify => Service["httpd"],
         }
         if $source {
             File["/etc/httpd/conf.http.d/${name}"] {
@@ -377,10 +390,10 @@ define apache::configfile($source="", $content="", $http=true, $https=true) {
                 true    => present,
                 default => absent,
             },
-            mode    => 0644,
-            owner   => root,
-            group   => root,
-            notify  => Service["httpsd"],
+            mode   => 0644,
+            owner  => root,
+            group  => root,
+            notify => Service["httpsd"],
         }
         if $source {
             File["/etc/httpd/conf.https.d/${name}"] {