whimsy-asf 0.0.35 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffd4b254505943e68d308ffb579a267d1f79dde6
-  data.tar.gz: 5cb26e36b11ab2ec95c3c5c436e20af22b2b644c
+  metadata.gz: 58768873c0a9afc365dd831603d62bf554853dc8
+  data.tar.gz: f92b8ea32754dffada5e8c56b7fbc6ac729af844
 SHA512:
-  metadata.gz: d7a3217956443d4d712ec99515e8c01c9c99fba8ce77a79c29b81d7d2cd141d1157084fe044ebeb326eab01b08a5c12a7b2ca9c123c49a74efc74c5dfd33b6a3
-  data.tar.gz: 338bd58d2d0530ae3558082ca45eaaa1e17e2268e62d26f67f108673dd530d1ce6494d9fa5fbe66a8aa09c93240415e16730048015d915ec8fc0967cb8cdada6
+  metadata.gz: ef0de1fe468a59698be338cd8e7ca26439d69b9d5e1aa218f02b1cba0683a4185c8a39ff028dc7aac1fa7b73b41c4ec2322319868e9c0f99bb6518fab9e664fc
+  data.tar.gz: d18e7a75f58703d293cfe6d58b94937b4026cea8c59db6a477b2b8519173e859e573951d4ec8bf6a5b4642a8924c8f942933880aaa1d40f343779b9c02094570

data/asf.version

@@ -1 +1 @@
-0.0.35
+0.0.36

data/lib/whimsy/asf/ldap.rb

@@ -2,6 +2,13 @@ require 'wunderbar'
 require 'ldap'
 
 module ASF
+  # determine where ldap.conf resides
+  if Dir.exist? '/etc/openldap'
+    ETCLDAP = '/etc/openldap'
+  else
+    ETCLDAP = '/etc/ldap'
+  end
+
   # determine whether or not the LDAP API can be used
   def self.init_ldap
     @ldap = nil
@@ -249,9 +256,9 @@ module ASF
 
       # check system configuration
       unless host
-        conf = '/etc/ldap/ldap.conf'
+        conf = "#{ETCLDAP}/ldap.conf"
         if File.exist? conf
-        host = File.read(conf)[/^uri\s+(ldaps?:\/\/\S+?:\d+)/i, 1]
+          host = File.read(conf)[/^uri\s+(ldaps?:\/\/\S+?:\d+)/i, 1]
         end
       end
 
@@ -278,17 +285,19 @@ module ASF
     # update /etc/ldap.conf. Usage:
     #   sudo ruby -r whimsy/asf -e "ASF::LDAP.configure"
     def self.configure
-      if not File.exist? "/etc/ldap/asf-ldap-client.pem"
-        File.write "/etc/ldap/asf-ldap-client.pem", self.cert
+      if not File.exist? "#{ETCLDAP}/asf-ldap-client.pem"
+        File.write "#{ETCLDAP}/asf-ldap-client.pem", self.cert
       end
 
-      ldap_conf = '/etc/ldap/ldap.conf'
+      ldap_conf = "#{ETCLDAP}/ldap.conf"
       content = File.read(ldap_conf)
       unless content.include? 'asf-ldap-client.pem'
         content.gsub!(/^TLS_CACERT/, '# TLS_CACERT')
-        content += "TLS_CACERT /etc/ldap/asf-ldap-client.pem\n"
+        content.gsub!(/^TLS_REQCERT/, '# TLS_REQCERT')
+        content += "TLS_CACERT #{ETCLDAP}/asf-ldap-client.pem\n"
         content += "uri #{LDAP.host}\n"
         content += "base dc=apache,dc=org\n"
+        content += "TLS_REQCERT allow\n" if ETCLDAP.include? 'openldap'
         File.write(ldap_conf, content)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whimsy-asf
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.36
 platform: ruby
 authors:
 - Sam Ruby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -104,8 +104,6 @@ extra_rdoc_files: []
 files:
 - asf.gemspec
 - asf.version
-- lib/whimsy/asf.rb
-- lib/whimsy/asf/agenda.rb
 - lib/whimsy/asf/agenda/attachments.rb
 - lib/whimsy/asf/agenda/back.rb
 - lib/whimsy/asf/agenda/committee.rb
@@ -113,6 +111,7 @@ files:
 - lib/whimsy/asf/agenda/front.rb
 - lib/whimsy/asf/agenda/minutes.rb
 - lib/whimsy/asf/agenda/special.rb
+- lib/whimsy/asf/agenda.rb
 - lib/whimsy/asf/auth.rb
 - lib/whimsy/asf/committee.rb
 - lib/whimsy/asf/config.rb
@@ -126,6 +125,7 @@ files:
 - lib/whimsy/asf/site.rb
 - lib/whimsy/asf/svn.rb
 - lib/whimsy/asf/watch.rb
+- lib/whimsy/asf.rb
 homepage: https://whimsy.apache.org/
 licenses:
 - Apache License, Version 2.0
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Whimsy 'model' of the ASF