This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new dc42182  ldap.conf file location varies
dc42182 is described below

commit dc421828df2c997e06aaf341381d8fe069df06ef
Author: Sebb <[email protected]>
AuthorDate: Tue Nov 26 10:37:01 2019 +0000

    ldap.conf file location varies
---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 5c98adb..bd290a9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -325,7 +325,7 @@ namespace :docker do
     rescue
     end
 
-    unless File.read('/etc/ldap/ldap.conf').include? 'asf-ldap-client.pem'
+    unless File.read(File.join(ASF::ETCLDAP,'ldap.conf')).include? 
'asf-ldap-client.pem'
       sh 'ruby -I lib -r whimsy/asf -e "ASF::LDAP.configure"'
     end
   end

Reply via email to