From ab317e2a370b65dc87cec4a54445e8b654027d2c Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Sat, 21 Apr 2018 15:27:07 +0200 Subject: [PATCH] Don't depend on ruby version for the omniauth-ldap patch --- conf/ldap-auth-fix-subfolder.patch | 4 ++-- scripts/install | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/conf/ldap-auth-fix-subfolder.patch b/conf/ldap-auth-fix-subfolder.patch index de005c7..d33826e 100644 --- a/conf/ldap-auth-fix-subfolder.patch +++ b/conf/ldap-auth-fix-subfolder.patch @@ -1,5 +1,5 @@ ---- discourse-ldap-auth.orig/gems/2.3.3/gems/omniauth-ldap-1.0.5/lib/omniauth/strategies/ldap.rb 2018-04-02 17:58:36.830909997 +0200 -+++ discourse-ldap-auth/gems/2.3.3/gems/omniauth-ldap-1.0.5/lib/omniauth/strategies/ldap.rb 2018-04-02 19:17:51.903732202 +0200 +--- omniauth-ldap-1.0.5.orig/lib/omniauth/strategies/ldap.rb 2018-04-02 17:58:36.830909997 +0200 ++++ omniauth-ldap-1.0.5/lib/omniauth/strategies/ldap.rb 2018-04-02 19:17:51.903732202 +0200 @@ -27,7 +27,8 @@ def request_phase diff --git a/scripts/install b/scripts/install index 7fc3cc0..dea69f2 100644 --- a/scripts/install +++ b/scripts/install @@ -234,9 +234,10 @@ y # CONFIGURE PLUGINS #================================================= -# Patch ldap-auth plugin to fix it when using domain subfolder +# Patch ldap-auth plugin dependency (omniauth-ldap) to fix it when using domain subfolder # (Can only do that now because we are patching dependencies which have just been downloaded) -(cd $final_path/plugins/discourse-ldap-auth +# Patch applied: https://github.com/omniauth/omniauth-ldap/pull/16 +(cd $final_path/plugins/discourse-ldap-auth/gems/*/gems/omniauth-ldap*/ patch -p1 < $YNH_CWD/../conf/ldap-auth-fix-subfolder.patch) #=================================================