Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fixes for COOK-1916 and COOK-1917 #30

Merged
merged 3 commits into from

2 participants

Pat Collins Joshua Timberman
Pat Collins

Ping. Creating pull request so this gets properly merged.

http://tickets.opscode.com/browse/COOK-1916
http://tickets.opscode.com/browse/COOK-1917

Joshua Timberman jtimberman merged commit 97aa784 into from
Anuj Biyani anujbiyani referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Nov 19, 2012
  1. Pat Collins

    [COOK-1916] Fix: Development for `mod_auth_openid` has apparently mov…

    patcoll authored
    …ed to Github, and releases are being stored there now.
  2. Pat Collins

    [COOK-1917]: Restart apache when adding new module. Also delete old s…

    patcoll authored
    …qlite db at the same time because the schemas are usually incompatible.
Commits on Dec 5, 2012
  1. Pat Collins
This page is out of date. Refresh to see the latest.
Showing with 14 additions and 3 deletions.
  1. +14 −3 recipes/mod_auth_openid.rb
17 recipes/mod_auth_openid.rb
View
@@ -62,7 +62,7 @@
cd libopkele-2.0.4 && ./configure --prefix=/usr --libdir=#{syslibdir}
#{make_cmd} && #{make_cmd} install
EOH
- not_if { File.exists?("#{syslibdir}/libopkele.a") }
+ creates "#{syslibdir}/libopkele.a"
end
end
@@ -71,11 +71,20 @@
configure_flags = node['apache']['mod_auth_openid']['configure_flags']
remote_file "#{Chef::Config['file_cache_path']}/mod_auth_openid-#{version}.tar.gz" do
- source "http://butterfat.net/releases/mod_auth_openid/mod_auth_openid-#{version}.tar.gz"
+ if Chef::Version.new(version) >= Chef::Version.new(0.7)
+ source "https://github.com/downloads/bmuller/mod_auth_openid/mod_auth_openid-#{version}.tar.gz"
+ else
+ source "http://butterfat.net/releases/mod_auth_openid/mod_auth_openid-#{version}.tar.gz"
+ end
mode 00644
checksum _checksum
end
+file "mod_auth_openid_dblocation" do
+ path node['apache']['mod_auth_openid']['dblocation']
+ action :nothing
+end
+
bash "install mod_auth_openid" do
cwd Chef::Config['file_cache_path']
code <<-EOH
@@ -84,7 +93,9 @@
perl -pi -e "s/-i -a -n 'authopenid'/-i -n 'authopenid'/g" Makefile
#{make_cmd} && #{make_cmd} install
EOH
- not_if { ::File.exists?("#{node['apache']['libexecdir']}/mod_auth_openid.so") }
+ creates "#{node['apache']['libexecdir']}/mod_auth_openid.so"
+ notifies :delete, "file[mod_auth_openid_dblocation]", :immediately
+ notifies :restart, "service[apache2]"
end
directory node['apache']['mod_auth_openid']['cache_dir'] do
Something went wrong with that request. Please try again.