Permalink
Browse files

updates from opscode cookbooks

  • Loading branch information...
Philip (flip) Kromer
Philip (flip) Kromer committed Nov 14, 2011
1 parent e4a44f4 commit 11ccbdd9b2fd5c2d43d3b4e712864fb4210c5926
Showing with 979 additions and 282 deletions.
  1. +353 −0 cookbooks/apache2/README.md
  2. +17 −1 {site-cookbooks → cookbooks}/apache2/attributes/default.rb
  3. +1 −0 {site-cookbooks → cookbooks}/apache2/definitions/apache_conf.rb
  4. +12 −3 {site-cookbooks → cookbooks}/apache2/definitions/apache_module.rb
  5. +6 −3 {site-cookbooks → cookbooks}/apache2/definitions/apache_site.rb
  6. +2 −2 {site-cookbooks → cookbooks}/apache2/definitions/web_app.rb
  7. 0 {site-cookbooks → cookbooks}/apache2/files/default/apache2_module_conf_generate.pl
  8. +4 −3 {site-cookbooks → cookbooks}/apache2/metadata.rb
  9. +28 −26 {site-cookbooks → cookbooks}/apache2/recipes/default.rb
  10. 0 {site-cookbooks → cookbooks}/apache2/recipes/god_monitor.rb
  11. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_alias.rb
  12. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_auth_basic.rb
  13. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_auth_digest.rb
  14. +32 −12 {site-cookbooks → cookbooks}/apache2/recipes/mod_auth_openid.rb
  15. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_authn_file.rb
  16. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_authnz_ldap.rb
  17. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_authz_default.rb
  18. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_authz_groupfile.rb
  19. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_authz_host.rb
  20. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_authz_user.rb
  21. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_autoindex.rb
  22. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_cgi.rb
  23. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_dav.rb
  24. +20 −0 cookbooks/apache2/recipes/mod_dav_fs.rb
  25. +8 −1 {site-cookbooks → cookbooks}/apache2/recipes/mod_dav_svn.rb
  26. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_deflate.rb
  27. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_dir.rb
  28. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_env.rb
  29. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_expires.rb
  30. +12 −4 {site-cookbooks → cookbooks}/apache2/recipes/mod_fcgid.rb
  31. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_headers.rb
  32. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_ldap.rb
  33. +1 −1 {site-cookbooks → cookbooks}/apache2/recipes/mod_log_config.rb
  34. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_mime.rb
  35. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_negotiation.rb
  36. +78 −0 cookbooks/apache2/recipes/mod_php5.rb
  37. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_proxy.rb
  38. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_proxy_ajp.rb
  39. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_proxy_balancer.rb
  40. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_proxy_connect.rb
  41. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_proxy_http.rb
  42. +1 −1 {site-cookbooks → cookbooks}/apache2/recipes/mod_python.rb
  43. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_rewrite.rb
  44. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_setenvif.rb
  45. +3 −2 {site-cookbooks → cookbooks}/apache2/recipes/mod_ssl.rb
  46. 0 {site-cookbooks → cookbooks}/apache2/recipes/mod_status.rb
  47. +1 −1 {site-cookbooks → cookbooks}/apache2/recipes/mod_wsgi.rb
  48. +27 −0 cookbooks/apache2/recipes/mod_xsendfile.rb
  49. 0 {site-cookbooks → cookbooks}/apache2/templates/default/a2dismod.erb
  50. +2 −2 {site-cookbooks → cookbooks}/apache2/templates/default/a2dissite.erb
  51. 0 {site-cookbooks → cookbooks}/apache2/templates/default/a2enmod.erb
  52. 0 {site-cookbooks → cookbooks}/apache2/templates/default/a2ensite.erb
  53. +2 −10 {site-cookbooks → cookbooks}/apache2/templates/default/apache2.conf.erb
  54. 0 {site-cookbooks → cookbooks}/apache2/templates/default/apache2.god.erb
  55. 0 {site-cookbooks → cookbooks}/apache2/templates/default/charset.erb
  56. +1 −1 {site-cookbooks → cookbooks}/apache2/templates/default/default-site.erb
  57. 0 {site-cookbooks → cookbooks}/apache2/templates/default/mod_auth_openid.rb.erb
  58. 0 {site-cookbooks → cookbooks}/apache2/templates/default/mods/README
  59. 0 {site-cookbooks → cookbooks}/apache2/templates/default/mods/alias.conf.erb
  60. +1 −0 cookbooks/apache2/templates/default/mods/authopenid.load.erb
  61. 0 {site-cookbooks → cookbooks}/apache2/templates/default/mods/autoindex.conf.erb
  62. 0 {site-cookbooks → cookbooks}/apache2/templates/default/mods/deflate.conf.erb
  63. 0 {site-cookbooks → cookbooks}/apache2/templates/default/mods/dir.conf.erb
  64. +1 −1 {site-cookbooks → cookbooks}/apache2/templates/default/mods/fcgid.conf.erb
  65. 0 {site-cookbooks → cookbooks}/apache2/templates/default/mods/mime.conf.erb
  66. 0 {site-cookbooks → cookbooks}/apache2/templates/default/mods/negotiation.conf.erb
  67. +16 −0 cookbooks/apache2/templates/default/mods/php5.conf.erb
  68. 0 {site-cookbooks → cookbooks}/apache2/templates/default/mods/proxy.conf.erb
  69. 0 {site-cookbooks → cookbooks}/apache2/templates/default/mods/setenvif.conf.erb
  70. +2 −2 {site-cookbooks → cookbooks}/apache2/templates/default/mods/ssl.conf.erb
  71. 0 {site-cookbooks → cookbooks}/apache2/templates/default/mods/status.conf.erb
  72. 0 {site-cookbooks → cookbooks}/apache2/templates/default/port_apache.erb
  73. 0 {site-cookbooks → cookbooks}/apache2/templates/default/ports.conf.erb
  74. 0 {site-cookbooks → cookbooks}/apache2/templates/default/security.erb
  75. 0 {site-cookbooks → cookbooks}/apache2/templates/default/web_app.conf.erb
  76. 0 {site-cookbooks → cookbooks}/python/README.md
  77. 0 {site-cookbooks → cookbooks}/python/attributes/default.rb
  78. 0 {site-cookbooks → cookbooks}/python/metadata.rb
  79. 0 {site-cookbooks → cookbooks}/python/providers/pip.rb
  80. 0 {site-cookbooks → cookbooks}/python/providers/virtualenv.rb
  81. 0 {site-cookbooks → cookbooks}/python/recipes/default.rb
  82. 0 {site-cookbooks → cookbooks}/python/recipes/package.rb
  83. 0 {site-cookbooks → cookbooks}/python/recipes/pip.rb
  84. 0 {site-cookbooks → cookbooks}/python/recipes/source.rb
  85. 0 {site-cookbooks → cookbooks}/python/recipes/virtualenv.rb
  86. 0 {site-cookbooks → cookbooks}/python/resources/pip.rb
  87. 0 {site-cookbooks → cookbooks}/python/resources/virtualenv.rb
  88. +23 −8 site-cookbooks/zenoss/TODO.txt → cookbooks/zenoss/CHANGELOG.md
  89. +20 −17 {site-cookbooks → cookbooks}/zenoss/README.md
  90. +14 −4 {site-cookbooks → cookbooks}/zenoss/attributes/default.rb
  91. +8 −0 cookbooks/zenoss/data_bags/Zenoss_Readonly_User.json
  92. +11 −0 cookbooks/zenoss/data_bags/Zenoss_User.json
  93. +6 −5 {site-cookbooks → cookbooks}/zenoss/metadata.rb
  94. +9 −1 {site-cookbooks → cookbooks}/zenoss/providers/zenbatchload.rb
  95. +42 −2 {site-cookbooks → cookbooks}/zenoss/providers/zendmd.rb
  96. +11 −1 {site-cookbooks → cookbooks}/zenoss/providers/zenpack.rb
  97. +1 −0 {site-cookbooks → cookbooks}/zenoss/providers/zenpatch.rb
  98. +3 −4 {site-cookbooks → cookbooks}/zenoss/recipes/client.rb
  99. 0 {site-cookbooks → cookbooks}/zenoss/recipes/default.rb
  100. +87 −41 {site-cookbooks → cookbooks}/zenoss/recipes/server.rb
  101. +1 −1 {site-cookbooks → cookbooks}/zenoss/resources/zenbatchload.rb
  102. +2 −1 {site-cookbooks → cookbooks}/zenoss/resources/zendmd.rb
  103. 0 {site-cookbooks → cookbooks}/zenoss/resources/zenpack.rb
  104. 0 {site-cookbooks → cookbooks}/zenoss/resources/zenpatch.rb
  105. +38 −0 cookbooks/zenoss/roles/Class_Server-SSH-Linux-MySQL.rb
  106. +24 −0 cookbooks/zenoss/roles/Class_Server-SSH-Linux.rb
  107. +10 −0 cookbooks/zenoss/roles/Location_Austin.rb
  108. +10 −0 cookbooks/zenoss/roles/Location_Seattle.rb
  109. +28 −0 cookbooks/zenoss/roles/ZenossServer.rb
  110. +0 −78 site-cookbooks/apache2/README.rdoc
  111. +0 −37 site-cookbooks/apache2/recipes/mod_php5.rb
  112. +0 −6 site-cookbooks/apache2/templates/default/mods/authopenid.load.erb
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -19,34 +19,50 @@
# Where the various parts of apache are
case platform
-when "redhat","centos","fedora","suse"
+when "redhat","centos","scientific","fedora","suse"
set[:apache][:dir] = "/etc/httpd"
set[:apache][:log_dir] = "/var/log/httpd"
set[:apache][:user] = "apache"
+ set[:apache][:group] = "apache"
set[:apache][:binary] = "/usr/sbin/httpd"
set[:apache][:icondir] = "/var/www/icons/"
set[:apache][:cache_dir] = "/var/cache/httpd"
+ if node.platform_version.to_f >= 6 then
+ set[:apache][:pid_file] = "/var/run/httpd/httpd.pid"
+ else
+ set[:apache][:pid_file] = "/var/run/httpd.pid"
+ end
+ set[:apache][:lib_dir] = node[:kernel][:machine] =~ /^i[36]86$/ ? "/usr/lib/httpd" : "/usr/lib64/httpd"
when "debian","ubuntu"
set[:apache][:dir] = "/etc/apache2"
set[:apache][:log_dir] = "/var/log/apache2"
set[:apache][:user] = "www-data"
+ set[:apache][:group] = "www-data"
set[:apache][:binary] = "/usr/sbin/apache2"
set[:apache][:icondir] = "/usr/share/apache2/icons"
set[:apache][:cache_dir] = "/var/cache/apache2"
+ set[:apache][:pid_file] = "/var/run/apache2.pid"
+ set[:apache][:lib_dir] = "/usr/lib/apache2"
when "arch"
set[:apache][:dir] = "/etc/httpd"
set[:apache][:log_dir] = "/var/log/httpd"
set[:apache][:user] = "http"
+ set[:apache][:group] = "http"
set[:apache][:binary] = "/usr/sbin/httpd"
set[:apache][:icondir] = "/usr/share/httpd/icons"
set[:apache][:cache_dir] = "/var/cache/httpd"
+ set[:apache][:pid_file] = "/var/run/httpd/httpd.pid"
+ set[:apache][:lib_dir] = "/usr/lib/httpd"
else
set[:apache][:dir] = "/etc/apache2"
set[:apache][:log_dir] = "/var/log/apache2"
set[:apache][:user] = "www-data"
+ set[:apache][:group] = "www-data"
set[:apache][:binary] = "/usr/sbin/apache2"
set[:apache][:icondir] = "/usr/share/apache2/icons"
set[:apache][:cache_dir] = "/var/cache/apache2"
+ set[:apache][:pid_file] = "logs/httpd.pid"
+ set[:apache][:lib_dir] = "/usr/lib/apache2"
end
###
@@ -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
@@ -19,11 +19,20 @@
define :apache_module, :enable => true, :conf => false do
include_recipe "apache2"
-
+
+ params[:filename] = params[:filename] || "mod_#{params[:name]}.so"
+
if params[:conf]
apache_conf params[:name]
end
-
+
+ if platform?("redhat", "centos", "scientific", "fedora", "arch", "suse" )
+ file "#{node['apache']['dir']}/mods-available/#{params[:name]}.load" do
+ content "LoadModule #{params[:name]}_module #{node['apache']['lib_dir']}/modules/#{params[:filename]}\n"
+ mode 0644
+ end
+ end
+
if params[:enable]
execute "a2enmod #{params[:name]}" do
command "/usr/sbin/a2enmod #{params[:name]}"
@@ -32,7 +41,7 @@
((File.exists?("#{node[:apache][:dir]}/mods-available/#{params[:name]}.conf"))?
(File.symlink?("#{node[:apache][:dir]}/mods-enabled/#{params[:name]}.conf")):(true)))
end
- end
+ end
else
execute "a2dismod #{params[:name]}" do
command "/usr/sbin/a2dismod #{params[:name]}"
@@ -19,12 +19,12 @@
define :apache_site, :enable => true do
include_recipe "apache2"
-
+
if params[:enable]
execute "a2ensite #{params[:name]}" do
command "/usr/sbin/a2ensite #{params[:name]}"
notifies :restart, resources(:service => "apache2")
- not_if do
+ not_if do
::File.symlink?("#{node[:apache][:dir]}/sites-enabled/#{params[:name]}") or
::File.symlink?("#{node[:apache][:dir]}/sites-enabled/000-#{params[:name]}")
end
@@ -34,7 +34,10 @@
execute "a2dissite #{params[:name]}" do
command "/usr/sbin/a2dissite #{params[:name]}"
notifies :restart, resources(:service => "apache2")
- only_if do ::File.symlink?("#{node[:apache][:dir]}/sites-enabled/#{params[:name]}") end
+ only_if do
+ ::File.symlink?("#{node[:apache][:dir]}/sites-enabled/#{params[:name]}") or
+ ::File.symlink?("#{node[:apache][:dir]}/sites-enabled/000-#{params[:name]}")
+ end
end
end
end
@@ -17,7 +17,7 @@
# limitations under the License.
#
-define :web_app, :template => "web_app.conf.erb" do
+define :web_app, :template => "web_app.conf.erb", :enable => true do
application_name = params[:name]
@@ -44,6 +44,6 @@
end
apache_site "#{params[:name]}.conf" do
- enable enable_setting
+ enable params[:enable]
end
end
@@ -2,8 +2,8 @@
maintainer_email "cookbooks@opscode.com"
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"
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version "1.0.2"
recipe "apache2", "Main Apache configuration"
recipe "apache2::mod_alias", "Apache module 'alias' with config file"
recipe "apache2::mod_auth_basic", "Apache module 'auth_basic'"
@@ -40,8 +40,9 @@
recipe "apache2::mod_setenvif", "Apache module 'setenvif' with config file"
recipe "apache2::mod_ssl", "Apache module 'ssl' with config file, adds port 443 to listen_ports"
recipe "apache2::mod_status", "Apache module 'status' with config file"
+recipe "apache2::mod_xsendfile", "Apache module 'xsendfile'"
-%w{redhat centos debian ubuntu arch}.each do |os|
+%w{redhat centos scientific fedora debian ubuntu arch }.each do |os|
supports os
end
@@ -19,7 +19,7 @@
package "apache2" do
case node[:platform]
- when "centos","redhat","fedora","suse"
+ when "redhat","centos","scientific","fedora","suse"
package_name "httpd"
when "debian","ubuntu"
package_name "apache2"
@@ -31,7 +31,7 @@
service "apache2" do
case node[:platform]
- when "centos","redhat","fedora","suse"
+ when "redhat","centos","scientific","fedora","suse"
service_name "httpd"
# If restarted/reloaded too quickly httpd has a habit of failing.
# This may happen with multiple recipes notifying apache to restart - like
@@ -48,21 +48,25 @@
supports value_for_platform(
"debian" => { "4.0" => [ :restart, :reload ], "default" => [ :restart, :reload, :status ] },
"ubuntu" => { "default" => [ :restart, :reload, :status ] },
- "centos" => { "default" => [ :restart, :reload, :status ] },
"redhat" => { "default" => [ :restart, :reload, :status ] },
+ "centos" => { "default" => [ :restart, :reload, :status ] },
+ "scientific" => { "default" => [ :restart, :reload, :status ] },
"fedora" => { "default" => [ :restart, :reload, :status ] },
"arch" => { "default" => [ :restart, :reload, :status ] },
+ "suse" => { "default" => [ :restart, :reload, :status ] },
"default" => { "default" => [:restart, :reload ] }
)
action :enable
end
-if platform?("centos", "redhat", "fedora", "suse", "arch")
+if platform?("redhat", "centos", "scientific", "fedora", "arch", "suse" )
directory node[:apache][:log_dir] do
mode 0755
action :create
end
-
+
+ package "perl"
+
cookbook_file "/usr/local/bin/apache2_module_conf_generate.pl" do
source "apache2_module_conf_generate.pl"
mode 0755
@@ -78,41 +82,39 @@
action :create
end
end
-
+
execute "generate-module-list" do
- if node[:kernel][:machine] == "x86_64"
+ if node[:kernel][:machine] == "x86_64"
libdir = value_for_platform("arch" => { "default" => "lib" }, "default" => "lib64")
- else
+ else
libdir = "lib"
end
command "/usr/local/bin/apache2_module_conf_generate.pl /usr/#{libdir}/httpd/modules /etc/httpd/mods-available"
action :run
end
-
+
%w{a2ensite a2dissite a2enmod a2dismod}.each do |modscript|
template "/usr/sbin/#{modscript}" do
source "#{modscript}.erb"
mode 0755
owner "root"
group "root"
- end
+ end
end
# installed by default on centos/rhel, remove in favour of mods-enabled
- file "#{node[:apache][:dir]}/conf.d/proxy_ajp.conf" do
- action :delete
- backup false
+ %w{ proxy_ajp auth_pam authz_ldap webalizer ssl welcome }.each do |f|
+ file "#{node[:apache][:dir]}/conf.d/#{f}.conf" do
+ action :delete
+ backup false
+ end
end
+
+ # installed by default on centos/rhel, remove in favour of mods-enabled
file "#{node[:apache][:dir]}/conf.d/README" do
action :delete
backup false
end
-
- # welcome page moved to the default-site.rb temlate
- file "#{node[:apache][:dir]}/conf.d/welcome.conf" do
- action :delete
- backup false
- end
end
directory "#{node[:apache][:dir]}/ssl" do
@@ -132,12 +134,13 @@
directory node[:apache][:cache_dir] do
action :create
mode 0755
- owner node[:apache][:user]
+ owner "root"
+ group "root"
end
template "apache2.conf" do
case node[:platform]
- when "centos","redhat","fedora","arch"
+ when "redhat", "centos", "scientific", "fedora", "arch"
path "#{node[:apache][:dir]}/conf/httpd.conf"
when "debian","ubuntu"
path "#{node[:apache][:dir]}/apache2.conf"
@@ -171,9 +174,9 @@
template "#{node[:apache][:dir]}/ports.conf" do
source "ports.conf.erb"
- group "root"
owner "root"
- variables :apache_listen_ports => node[:apache][:listen_ports]
+ group "root"
+ variables :apache_listen_ports => node[:apache][:listen_ports].map{|p| p.to_i}.uniq
mode 0644
notifies :restart, resources(:service => "apache2")
end
@@ -200,10 +203,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?("redhat", "centos", "scientific", "fedora", "suse", "arch")
-# uncomment to get working example site on centos/redhat/fedora
-#apache_site "default"
+apache_site "default" if platform?("redhat", "centos", "scientific", "fedora")
service "apache2" do
action :start
@@ -18,8 +18,10 @@
#
openid_dev_pkgs = value_for_platform(
- "ubuntu" => { "default" => %w{ apache2-prefork-dev libopkele-dev libopkele3 } },
- "debian" => { "default" => %w{ apache2-prefork-dev libopkele-dev libopkele3 } },
+ ["ubuntu","debian"] => { "default" => %w{ g++ apache2-prefork-dev libopkele-dev libopkele3 } },
+ ["centos","redhat","scientific","fedora"] => {
+ "default" => %w{ gcc-c++ httpd-devel curl-devel libtidy libtidy-devel sqlite-devel pcre-devel openssl-devel make }
+ },
"arch" => { "default" => ["libopkele"] }
)
@@ -40,6 +42,26 @@
end
end
+case node[:platform]
+when "redhat", "centos", "scientific", "fedora"
+ remote_file "#{Chef::Config[:file_cache_path]}/libopkele-2.0.4.tar.gz" do
+ source "http://kin.klever.net/dist/libopkele-2.0.4.tar.gz"
+ mode 0644
+ end
+
+ bash "install libopkele" do
+ cwd "#{Chef::Config[:file_cache_path]}"
+ # Ruby 1.8.6 does not have rpartition, unfortunately
+ syslibdir = node[:apache][:lib_dir][0..node[:apache][:lib_dir].rindex("/")]
+ code <<-EOH
+ tar zxvf libopkele-2.0.4.tar.gz
+ cd libopkele-2.0.4 && ./configure --prefix=/usr --libdir=#{syslibdir}
+ make && make install
+ EOH
+ not_if { File.exists?("#{syslibdir}/libopkele.a") }
+ end
+end
+
remote_file "#{Chef::Config[:file_cache_path]}/mod_auth_openid-0.4.tar.gz" do
source "http://butterfat.net/releases/mod_auth_openid/mod_auth_openid-0.4.tar.gz"
mode 0644
@@ -53,16 +75,12 @@
perl -pi -e "s/-i -a -n 'authopenid'/-i -n 'authopenid'/g" Makefile
make && make install
EOH
- case node[:platform]
- when "arch"
- not_if { ::File.exists?("/usr/lib/httpd/modules/mod_auth_openid.so") }
- else
- not_if { ::File.exists?("/usr/lib/apache2/modules/mod_auth_openid.so") }
- end
+ not_if { ::File.exists?("#{node[:apache][:lib_dir]}/modules/mod_auth_openid.so") }
end
file "#{node[:apache][:cache_dir]}/mod_auth_openid.db" do
- owner node[:apache][:user]
+ owner "root"
+ group node[:apache][:group]
mode 0640
end
@@ -73,11 +91,13 @@
mode 0644
end
-apache_module "authopenid"
+apache_module "authopenid" do
+ filename "mod_auth_openid.so"
+end
template "/usr/local/bin/mod_auth_openid.rb" do
source "mod_auth_openid.rb.erb"
- owner node[:apache][:user]
- group node[:apache][:user]
+ owner "root"
+ group node[:apache][:group]
mode 0750
end
@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: apache2
+# Recipe:: dav_fs
+#
+# Copyright 2011, Atriso
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+apache_module "dav_fs"
Oops, something went wrong.

0 comments on commit 11ccbdd

Please sign in to comment.