fix gitlab_configure_oauth_saml_attribute_statements()

OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME reflects username: in gitlab.yml
OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME is not required.
This commit is contained in:
KOMURA Takaaki 2019-05-29 16:01:48 +09:00
parent c5b1a28045
commit 6fb00aea11

View File

@ -589,12 +589,12 @@ gitlab_configure_oauth_bitbucket() {
}
gitlab_configure_oauth_saml_attribute_statements() {
if [[ -n ${OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL} && \
-n ${OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME} ]]; then
if [[ -n ${OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL} ]]; then
echo "Configuring gitlab::oauth::saml::attribute_statements..."
update_template ${GITLAB_CONFIG} \
OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL \
OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME \
OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME \
OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME \
OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME
# Remove undefined optional attributes