YunoHost-Apps/discourse_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/discourse_ynh.git synced 2024-09-03 18:26:18 +02:00
Code Issues Activity Actions

Don't depend on ruby version for the omniauth-ldap patch

Browse source
This commit is contained in:
Jimmy Monin 2018-04-21 15:27:07 +02:00
parent ff64835b73
commit ab317e2a37
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conf/ldap-auth-fix-subfolder.patch
View file

@ -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 --- omniauth-ldap-1.0.5.orig/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/lib/omniauth/strategies/ldap.rb 2018-04-02 19:17:51.903732202 +0200
@@ -27,7 +27,8 @@ @@ -27,7 +27,8 @@
def request_phase def request_phase

5
scripts/install
View file

@ -234,9 +234,10 @@ y
# CONFIGURE PLUGINS # 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) # (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) patch -p1 < $YNH_CWD/../conf/ldap-auth-fix-subfolder.patch)
#================================================= #=================================================