diff --git a/README.md b/README.md index 83942f81..d813e13d 100644 --- a/README.md +++ b/README.md @@ -770,6 +770,7 @@ Below is the complete list of available options that can be used to customize yo - **SMTP_OPENSSL_VERIFY_MODE**: SMTP openssl verification mode. Accepted values are `none`, `peer`, `client_once` and `fail_if_no_peer_cert`. Defaults to `none`. - **SMTP_AUTHENTICATION**: Specify the SMTP authentication method. Defaults to `login` if `SMTP_USER` is set. - **LDAP_ENABLED**: Enable LDAP. Defaults to `false` +- **LDAP_LABEL**: Label to show on login tab for LDAP server. Defaults to 'LDAP' - **LDAP_HOST**: LDAP Host - **LDAP_PORT**: LDAP Port. Defaults to `389` - **LDAP_UID**: LDAP UID. Defaults to `sAMAccountName` diff --git a/assets/config/gitlabhq/gitlab.yml b/assets/config/gitlabhq/gitlab.yml index 8449a8b2..4ce9deae 100644 --- a/assets/config/gitlabhq/gitlab.yml +++ b/assets/config/gitlabhq/gitlab.yml @@ -128,7 +128,7 @@ production: &base # for instance if you find out it is too large to fit on the web page. # # Example: 'Paris' or 'Acme, Ltd.' - label: 'LDAP' + label: "{{LDAP_LABEL}}" host: "{{LDAP_HOST}}" port: {{LDAP_PORT}} diff --git a/entrypoint.sh b/entrypoint.sh index 6c836208..483723a9 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -103,6 +103,7 @@ LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN=${LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN:-} LDAP_BLOCK_AUTO_CREATED_USERS=${LDAP_BLOCK_AUTO_CREATED_USERS:-false} LDAP_BASE=${LDAP_BASE:-} LDAP_USER_FILTER=${LDAP_USER_FILTER:-} +LDAP_LABEL=${LDAP_LABEL:-LDAP} GITLAB_HTTPS_HSTS_ENABLED=${GITLAB_HTTPS_HSTS_ENABLED:-true} GITLAB_HTTPS_HSTS_MAXAGE=${GITLAB_HTTPS_HSTS_MAXAGE:-31536000} @@ -500,6 +501,7 @@ sudo -HEu ${GITLAB_USER} sed 's/{{LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN}}/'"${LDAP_ sudo -HEu ${GITLAB_USER} sed 's/{{LDAP_BLOCK_AUTO_CREATED_USERS}}/'"${LDAP_BLOCK_AUTO_CREATED_USERS}"'/' -i config/gitlab.yml sudo -HEu ${GITLAB_USER} sed 's/{{LDAP_BASE}}/'"${LDAP_BASE}"'/' -i config/gitlab.yml sudo -HEu ${GITLAB_USER} sed 's/{{LDAP_USER_FILTER}}/'"${LDAP_USER_FILTER}"'/' -i config/gitlab.yml +sudo -HEu ${GITLAB_USER} sed 's/{{LDAP_LABEL}}/'"${LDAP_LABEL}"'/' -i config/gitlab.yml # apply aws s3 backup configuration case ${AWS_BACKUPS} in