JoelB commented on a change in pull request #369: GUACAMOLE-716: Add all LDAP
properties to Docker start script
URL: https://github.com/apache/guacamole-client/pull/369#discussion_r250773839
##########
File path: guacamole-docker/bin/start.sh
##########
@@ -303,27 +303,29 @@ END
set_property "ldap-hostname" "$LDAP_HOSTNAME"
set_optional_property "ldap-port" "$LDAP_PORT"
set_optional_property "ldap-encryption-method" "$LDAP_ENCRYPTION_METHOD"
+ set_optional_property "ldap-max-search-results" "$LDAP_MAX_SEARCH_RESULTS"
+ set_optional_property "ldap-search-bind-dn" "$LDAP_SEARCH_BIND_DN"
set_property "ldap-user-base-dn" "$LDAP_USER_BASE_DN"
set_optional_property "ldap-username-attribute" "$LDAP_USERNAME_ATTRIBUTE"
- set_optional_property "ldap-member-attribute" "$LDAP_MEMBER_ATTRIBUTE"
- set_optional_property "ldap-group-base-dn" "$LDAP_GROUP_BASE_DN"
+ set_optional_property "ldap-user-search-filter" "$LDAP_USER_SEARCH_FILTER"
set_optional_property "ldap-config-base-dn" "$LDAP_CONFIG_BASE_DN"
-
- set_optional_property \
- "ldap-search-bind-dn" \
- "$LDAP_SEARCH_BIND_DN"
Review comment:
Hi Nick, I actually preferred that when making the change but opted to keep
it the same as the previous formatting where the shorter lines were grouped and
then the longer lines grouped after.
Just to be clear, would you prefer to have them interspersed like this?
set_optional_property "ldap-search-bind-dn" "$LDAP_SEARCH_BIND_DN"
set_optional_property \
"ldap-search-bind-password" \
"$LDAP_SEARCH_BIND_PASSWORD"
set_property "ldap-user-base-dn" "$LDAP_USER_BASE_DN"
set_optional_property "ldap-username-attribute"
"$LDAP_USERNAME_ATTRIBUTE"
Let me know and I'll amend the PR.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
