diff --git a/Changelog.md b/Changelog.md index 61f86b71..9e7455df 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,7 @@ - gitlab-shell: upgrade to v.2.6.2 - gitlab: upgrade to CE v.7.10.0 - init: removed ENV variables to configure *External Issue Tracker* integration +- init: added `GITLAB_EMAIL_REPLY_TO` configuration option **7.9.4** - gitlab: upgrade to CE v.7.9.4 diff --git a/README.md b/README.md index 871022bf..3395a629 100644 --- a/README.md +++ b/README.md @@ -702,6 +702,7 @@ Below is the complete list of available options that can be used to customize yo - **GITLAB_ROOT_PASSWORD**: The password for the root user. Defaults to `5iveL!fe`. - **GITLAB_EMAIL**: The email address for the GitLab server. Defaults to `example@example.com`. - **GITLAB_EMAIL_DISPLAY_NAME**: The name displayed in emails sent out by the GitLab mailer. Defaults to `GitLab`. +- **GITLAB_EMAIL_REPLY_TO**: The reply to address of emails sent out by GitLab. Defaults to the `noreply@example.com`. - **GITLAB_EMAIL_ENABLED**: Enable or disable gitlab mailer. Defaults to the `SMTP_ENABLED` configuration. - **GITLAB_USERNAME_CHANGE**: Enable or disable ability for users to change their username. Defaults is `true`. - **GITLAB_CREATE_GROUP**: Enable or disable ability for users to create groups. Defaults is `true`. diff --git a/assets/config/gitlabhq/gitlab.yml b/assets/config/gitlabhq/gitlab.yml index dd98faa8..24fff7d3 100644 --- a/assets/config/gitlabhq/gitlab.yml +++ b/assets/config/gitlabhq/gitlab.yml @@ -49,7 +49,7 @@ production: &base # Email address used in the "From" field in mails sent by GitLab email_from: "{{GITLAB_EMAIL}}" email_display_name: "{{GITLAB_EMAIL_DISPLAY_NAME}}" - email_reply_to: noreply@example.com + email_reply_to: "{{GITLAB_EMAIL_REPLY_TO}}" # Email server smtp settings are in config/initializers/smtp_settings.rb.sample diff --git a/assets/init b/assets/init index 01a1974d..385d76e4 100755 --- a/assets/init +++ b/assets/init @@ -20,6 +20,7 @@ GITLAB_SSH_PORT=${GITLAB_SSH_PORT:-22} GITLAB_HTTPS=${GITLAB_HTTPS:-false} GITLAB_EMAIL=${GITLAB_EMAIL:-example@example.com} GITLAB_EMAIL_DISPLAY_NAME=${GITLAB_EMAIL_DISPLAY_NAME:-GitLab} +GITLAB_EMAIL_REPLY_TO=${GITLAB_EMAIL_REPLY_TO:-noreply@example.com} GITLAB_TIMEZONE=${GITLAB_TIMEZONE:-UTC} GITLAB_USERNAME_CHANGE=${GITLAB_USERNAME_CHANGE:-true} GITLAB_CREATE_GROUP=${GITLAB_CREATE_GROUP:-true} @@ -386,6 +387,7 @@ sudo -u git -H sed 's/{{GITLAB_PORT}}/'"${GITLAB_PORT}"'/' -i config/gitlab.yml sudo -u git -H sed 's/{{GITLAB_HTTPS}}/'"${GITLAB_HTTPS}"'/' -i config/gitlab.yml sudo -u git -H sed 's/{{GITLAB_EMAIL}}/'"${GITLAB_EMAIL}"'/' -i config/gitlab.yml sudo -u git -H sed 's/{{GITLAB_EMAIL_DISPLAY_NAME}}/'"${GITLAB_EMAIL_DISPLAY_NAME}"'/' -i config/gitlab.yml +sudo -u git -H sed 's/{{GITLAB_EMAIL_REPLY_TO}}/'"${GITLAB_EMAIL_REPLY_TO}"'/' -i config/gitlab.yml sudo -u git -H sed 's/{{GITLAB_BACKUP_EXPIRY}}/'"${GITLAB_BACKUP_EXPIRY}"'/' -i config/gitlab.yml sudo -u git -H sed 's/{{GITLAB_MAX_SIZE}}/'"${GITLAB_MAX_SIZE}"'/' -i config/gitlab.yml sudo -u git -H sed 's/{{GITLAB_SSH_HOST}}/'"${GITLAB_SSH_HOST}"'/' -i config/gitlab.yml