From c39cc1114cd2eb69016969398056e597986a5ca0 Mon Sep 17 00:00:00 2001
From: Seth Chisamore <schisamo@opscode.com>
Date: Tue, 12 Jul 2011 17:51:24 -0400
Subject: [PATCH] Import apache2 version 0.99.4

---
 cookbooks/apache2/definitions/apache_conf.rb |  1 +
 cookbooks/apache2/metadata.json              | 22 ++++++--------------
 cookbooks/apache2/metadata.rb                |  2 +-
 cookbooks/apache2/recipes/mod_php5.rb        |  2 +-
 cookbooks/apache2/recipes/mod_ssl.rb         |  1 +
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/cookbooks/apache2/definitions/apache_conf.rb b/cookbooks/apache2/definitions/apache_conf.rb
index 2439289..678915b 100644
--- a/cookbooks/apache2/definitions/apache_conf.rb
+++ b/cookbooks/apache2/definitions/apache_conf.rb
@@ -21,5 +21,6 @@
   template "#{node[:apache][:dir]}/mods-available/#{params[:name]}.conf" do
     source "mods/#{params[:name]}.conf.erb"
     notifies :restart, resources(:service => "apache2")
+    mode 0644
   end
 end
diff --git a/cookbooks/apache2/metadata.json b/cookbooks/apache2/metadata.json
index d2ff6f0..34f508a 100644
--- a/cookbooks/apache2/metadata.json
+++ b/cookbooks/apache2/metadata.json
@@ -6,21 +6,11 @@
   "maintainer_email": "cookbooks@opscode.com",
   "license": "Apache 2.0",
   "platforms": {
-    "redhat": [
-
-    ],
-    "centos": [
-
-    ],
-    "debian": [
-
-    ],
-    "ubuntu": [
-
-    ],
-    "arch": [
-
-    ]
+    "redhat": ">= 0.0.0",
+    "centos": ">= 0.0.0",
+    "debian": ">= 0.0.0",
+    "ubuntu": ">= 0.0.0",
+    "arch": ">= 0.0.0"
   },
   "dependencies": {
   },
@@ -496,5 +486,5 @@
     "apache2::mod_ssl": "Apache module 'ssl' with config file, adds port 443 to listen_ports",
     "apache2::mod_status": "Apache module 'status' with config file"
   },
-  "version": "0.99.3"
+  "version": "0.99.4"
 }
\ No newline at end of file
diff --git a/cookbooks/apache2/metadata.rb b/cookbooks/apache2/metadata.rb
index 40d0b94..27839ba 100644
--- a/cookbooks/apache2/metadata.rb
+++ b/cookbooks/apache2/metadata.rb
@@ -3,7 +3,7 @@
 license           "Apache 2.0"
 description       "Installs and configures all aspects of apache2 using Debian style symlinks with helper definitions"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.rdoc'))
-version           "0.99.3"
+version           "0.99.4"
 recipe            "apache2", "Main Apache configuration"
 recipe            "apache2::mod_alias", "Apache module 'alias' with config file"
 recipe            "apache2::mod_auth_basic", "Apache module 'auth_basic'"
diff --git a/cookbooks/apache2/recipes/mod_php5.rb b/cookbooks/apache2/recipes/mod_php5.rb
index 9950b05..80e2bce 100644
--- a/cookbooks/apache2/recipes/mod_php5.rb
+++ b/cookbooks/apache2/recipes/mod_php5.rb
@@ -28,7 +28,7 @@
     notifies :run, resources(:execute => "generate-module-list"), :immediately
   end
 when "centos", "redhat", "fedora"
-  package "php" do
+  package "php53" do
     action :install
     notifies :run, resources(:execute => "generate-module-list"), :immediately
   end
diff --git a/cookbooks/apache2/recipes/mod_ssl.rb b/cookbooks/apache2/recipes/mod_ssl.rb
index e82b9d1..9712384 100644
--- a/cookbooks/apache2/recipes/mod_ssl.rb
+++ b/cookbooks/apache2/recipes/mod_ssl.rb
@@ -35,6 +35,7 @@
   source "ports.conf.erb"
   variables :apache_listen_ports => ports
   notifies :restart, resources(:service => "apache2")
+  mode 0644
 end
 
 apache_module "ssl" do