From 8455e5c9f342b564303407bc9ae6d052e514b9fe Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 May 2014 15:07:23 -0400 Subject: [PATCH] If SMTP_AUTHENTICATION is an empty string then remove the smtp_authentication line in smtp config --- assets/init | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/assets/init b/assets/init index 4ccc0a1b..ab6ebbd7 100755 --- a/assets/init +++ b/assets/init @@ -343,7 +343,11 @@ else fi sudo -u git -H sed 's/{{SMTP_DOMAIN}}/'"${SMTP_DOMAIN}"'/' -i /home/git/gitlab/config/initializers/smtp_settings.rb sudo -u git -H sed 's/{{SMTP_STARTTLS}}/'"${SMTP_STARTTLS}"'/' -i /home/git/gitlab/config/initializers/smtp_settings.rb -sudo -u git -H sed 's/{{SMTP_AUTHENTICATION}}/'"${SMTP_AUTHENTICATION}"'/' -i /home/git/gitlab/config/initializers/smtp_settings.rb +if [ -n "${SMTP_AUTHENTICATION}" ]; then + sudo -u git -H sed '/{{SMTP_AUTHENTICATION}}/d' -i /home/git/gitlab/config/initializers/smtp_settings.rb +else + sudo -u git -H sed 's/{{SMTP_AUTHENTICATION}}/'"${SMTP_AUTHENTICATION}"'/' -i /home/git/gitlab/config/initializers/smtp_settings.rb +fi # apply LDAP configuration sudo -u git -H sed 's/{{LDAP_ENABLED}}/'"${LDAP_ENABLED}"'/' -i /home/git/gitlab/config/gitlab.yml