Permalink
Browse files

Merge branch 'master' of git://github.com/opscode/cookbooks

  • Loading branch information...
2 parents 6789865 + a2452dd commit 605297566ec7be1dcb3766e87ad561771c1779c3 @hedgehog hedgehog committed Apr 13, 2011
Showing with 6 additions and 5 deletions.
  1. +1 −0 definitions/apache_conf.rb
  2. +1 −1 metadata.json
  3. +1 −1 metadata.rb
  4. +2 −3 recipes/default.rb
  5. +1 −0 recipes/mod_ssl.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
View
@@ -496,5 +496,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.2"
+ "version": "0.99.3"
}
View
@@ -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.2"
+version "0.99.3"
recipe "apache2", "Main Apache configuration"
recipe "apache2::mod_alias", "Apache module 'alias' with config file"
recipe "apache2::mod_auth_basic", "Apache module 'auth_basic'"
View
@@ -200,10 +200,9 @@
include_recipe "apache2::mod_mime"
include_recipe "apache2::mod_negotiation"
include_recipe "apache2::mod_setenvif"
-include_recipe "apache2::mod_log_config" if platform?("centos", "redhat", "suse", "arch")
+include_recipe "apache2::mod_log_config" if platform?("centos", "redhat", "fedora", "suse", "arch")
-# uncomment to get working example site on centos/redhat/fedora
-#apache_site "default"
+apache_site "default" if platform?("centos", "redhat", "fedora")
service "apache2" do
action :start
View
@@ -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

0 comments on commit 6052975

Please sign in to comment.