From 5f1aa89c560fe613a52069e265e36b4b111b1ca5 Mon Sep 17 00:00:00 2001 From: Mauro Torrez Date: Sat, 12 Oct 2019 19:25:07 -0300 Subject: [PATCH] ldap: fix config, entrypoint: fix path --- 14.0/unit/entrypoint.sh | 2 +- 14.0/unit/ldap_setup.sh | 4 +++- 15.0/unit/entrypoint.sh | 2 +- 15.0/unit/ldap_setup.sh | 4 +++- 16.0/unit/entrypoint.sh | 2 +- 16.0/unit/ldap_setup.sh | 4 +++- 17.0/unit/entrypoint.sh | 2 +- 17.0/unit/ldap_setup.sh | 4 +++- docker-entrypoint.sh | 2 +- docker-ldap_setup.sh | 4 +++- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/14.0/unit/entrypoint.sh b/14.0/unit/entrypoint.sh index 501839b..a0b8db7 100755 --- a/14.0/unit/entrypoint.sh +++ b/14.0/unit/entrypoint.sh @@ -31,7 +31,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "$1" = "unitd" else echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\"" fi - } > /usr/local/etc/php/conf.d/redis-session.ini + } > /etc/php/7.3/embed/conf.d/redis-session.ini fi installed_version="0.0.0.0" diff --git a/14.0/unit/ldap_setup.sh b/14.0/unit/ldap_setup.sh index 05b709d..76024a9 100755 --- a/14.0/unit/ldap_setup.sh +++ b/14.0/unit/ldap_setup.sh @@ -90,7 +90,6 @@ php occ ldap:set-config s01 ldapGroupMemberAssocAttr "${LDAP_GROUP_MEMBER_ASSOC_ # | ldapAttributesForGroupSearch | | # | ldapAttributesForUserSearch | | # | ldapCacheTTL | 600 | -# | ldapConfigurationActive | 0 | # | ldapDefaultPPolicyDN | | # | ldapDynamicGroupMemberURL | | # | ldapExperiencedAdmin | 0 | @@ -109,4 +108,7 @@ php occ ldap:set-config s01 ldapGroupMemberAssocAttr "${LDAP_GROUP_MEMBER_ASSOC_ # | turnOnPasswordChange | 0 | # | useMemberOfToDetectMembership | 1 | +# set config as active +php occ ldap:set-config s01 ldapConfigurationActive 1 + cd ${PREV_DIR} diff --git a/15.0/unit/entrypoint.sh b/15.0/unit/entrypoint.sh index 501839b..a0b8db7 100755 --- a/15.0/unit/entrypoint.sh +++ b/15.0/unit/entrypoint.sh @@ -31,7 +31,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "$1" = "unitd" else echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\"" fi - } > /usr/local/etc/php/conf.d/redis-session.ini + } > /etc/php/7.3/embed/conf.d/redis-session.ini fi installed_version="0.0.0.0" diff --git a/15.0/unit/ldap_setup.sh b/15.0/unit/ldap_setup.sh index 05b709d..76024a9 100755 --- a/15.0/unit/ldap_setup.sh +++ b/15.0/unit/ldap_setup.sh @@ -90,7 +90,6 @@ php occ ldap:set-config s01 ldapGroupMemberAssocAttr "${LDAP_GROUP_MEMBER_ASSOC_ # | ldapAttributesForGroupSearch | | # | ldapAttributesForUserSearch | | # | ldapCacheTTL | 600 | -# | ldapConfigurationActive | 0 | # | ldapDefaultPPolicyDN | | # | ldapDynamicGroupMemberURL | | # | ldapExperiencedAdmin | 0 | @@ -109,4 +108,7 @@ php occ ldap:set-config s01 ldapGroupMemberAssocAttr "${LDAP_GROUP_MEMBER_ASSOC_ # | turnOnPasswordChange | 0 | # | useMemberOfToDetectMembership | 1 | +# set config as active +php occ ldap:set-config s01 ldapConfigurationActive 1 + cd ${PREV_DIR} diff --git a/16.0/unit/entrypoint.sh b/16.0/unit/entrypoint.sh index 501839b..a0b8db7 100755 --- a/16.0/unit/entrypoint.sh +++ b/16.0/unit/entrypoint.sh @@ -31,7 +31,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "$1" = "unitd" else echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\"" fi - } > /usr/local/etc/php/conf.d/redis-session.ini + } > /etc/php/7.3/embed/conf.d/redis-session.ini fi installed_version="0.0.0.0" diff --git a/16.0/unit/ldap_setup.sh b/16.0/unit/ldap_setup.sh index 05b709d..76024a9 100755 --- a/16.0/unit/ldap_setup.sh +++ b/16.0/unit/ldap_setup.sh @@ -90,7 +90,6 @@ php occ ldap:set-config s01 ldapGroupMemberAssocAttr "${LDAP_GROUP_MEMBER_ASSOC_ # | ldapAttributesForGroupSearch | | # | ldapAttributesForUserSearch | | # | ldapCacheTTL | 600 | -# | ldapConfigurationActive | 0 | # | ldapDefaultPPolicyDN | | # | ldapDynamicGroupMemberURL | | # | ldapExperiencedAdmin | 0 | @@ -109,4 +108,7 @@ php occ ldap:set-config s01 ldapGroupMemberAssocAttr "${LDAP_GROUP_MEMBER_ASSOC_ # | turnOnPasswordChange | 0 | # | useMemberOfToDetectMembership | 1 | +# set config as active +php occ ldap:set-config s01 ldapConfigurationActive 1 + cd ${PREV_DIR} diff --git a/17.0/unit/entrypoint.sh b/17.0/unit/entrypoint.sh index 501839b..a0b8db7 100755 --- a/17.0/unit/entrypoint.sh +++ b/17.0/unit/entrypoint.sh @@ -31,7 +31,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "$1" = "unitd" else echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\"" fi - } > /usr/local/etc/php/conf.d/redis-session.ini + } > /etc/php/7.3/embed/conf.d/redis-session.ini fi installed_version="0.0.0.0" diff --git a/17.0/unit/ldap_setup.sh b/17.0/unit/ldap_setup.sh index 05b709d..76024a9 100755 --- a/17.0/unit/ldap_setup.sh +++ b/17.0/unit/ldap_setup.sh @@ -90,7 +90,6 @@ php occ ldap:set-config s01 ldapGroupMemberAssocAttr "${LDAP_GROUP_MEMBER_ASSOC_ # | ldapAttributesForGroupSearch | | # | ldapAttributesForUserSearch | | # | ldapCacheTTL | 600 | -# | ldapConfigurationActive | 0 | # | ldapDefaultPPolicyDN | | # | ldapDynamicGroupMemberURL | | # | ldapExperiencedAdmin | 0 | @@ -109,4 +108,7 @@ php occ ldap:set-config s01 ldapGroupMemberAssocAttr "${LDAP_GROUP_MEMBER_ASSOC_ # | turnOnPasswordChange | 0 | # | useMemberOfToDetectMembership | 1 | +# set config as active +php occ ldap:set-config s01 ldapConfigurationActive 1 + cd ${PREV_DIR} diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 501839b..a0b8db7 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -31,7 +31,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "$1" = "unitd" else echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\"" fi - } > /usr/local/etc/php/conf.d/redis-session.ini + } > /etc/php/7.3/embed/conf.d/redis-session.ini fi installed_version="0.0.0.0" diff --git a/docker-ldap_setup.sh b/docker-ldap_setup.sh index 05b709d..76024a9 100755 --- a/docker-ldap_setup.sh +++ b/docker-ldap_setup.sh @@ -90,7 +90,6 @@ php occ ldap:set-config s01 ldapGroupMemberAssocAttr "${LDAP_GROUP_MEMBER_ASSOC_ # | ldapAttributesForGroupSearch | | # | ldapAttributesForUserSearch | | # | ldapCacheTTL | 600 | -# | ldapConfigurationActive | 0 | # | ldapDefaultPPolicyDN | | # | ldapDynamicGroupMemberURL | | # | ldapExperiencedAdmin | 0 | @@ -109,4 +108,7 @@ php occ ldap:set-config s01 ldapGroupMemberAssocAttr "${LDAP_GROUP_MEMBER_ASSOC_ # | turnOnPasswordChange | 0 | # | useMemberOfToDetectMembership | 1 | +# set config as active +php occ ldap:set-config s01 ldapConfigurationActive 1 + cd ${PREV_DIR}