From 92fe898c7e7a7d75f63fc398ade6e52318ff9902 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Mon, 23 Mar 2015 16:05:24 +0530
Subject: [PATCH] init: set default value of `SMTP_OPENSSL_VERIFY_MODE` to
 `peer`

---
 Changelog.md | 1 +
 README.md    | 2 +-
 assets/init  | 9 ++-------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 62d7ea9d..b13d2590 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@
 - gitlab-shell: upgrade to v.2.6.0
 - gitlab: upgrade to CE v.7.9.0
 - init: set default value of `UNICORN_WORKERS` to `3`
+- init: set default value of `SMTP_OPENSSL_VERIFY_MODE` to `peer`
 
 **7.8.4**
 - gitlab: upgrade to CE v.7.8.4
diff --git a/README.md b/README.md
index db116518..831f74d4 100644
--- a/README.md
+++ b/README.md
@@ -768,7 +768,7 @@ Below is the complete list of available options that can be used to customize yo
 - **SMTP_USER**: SMTP username.
 - **SMTP_PASS**: SMTP password.
 - **SMTP_STARTTLS**: Enable STARTTLS. Defaults to `true`.
-- **SMTP_OPENSSL_VERIFY_MODE**: SMTP openssl verification mode. Accepted values are `none`, `peer`, `client_once` and `fail_if_no_peer_cert`. SSL certificate verification is performed by default.
+- **SMTP_OPENSSL_VERIFY_MODE**: SMTP openssl verification mode. Accepted values are `none`, `peer`, `client_once` and `fail_if_no_peer_cert`. Defaults to `peer`.
 - **SMTP_AUTHENTICATION**: Specify the SMTP authentication method. Defaults to `login` if `SMTP_USER` is set.
 - **LDAP_ENABLED**: Enable LDAP. Defaults to `false`
 - **LDAP_HOST**: LDAP Host
diff --git a/assets/init b/assets/init
index a52063a1..cf3880c8 100755
--- a/assets/init
+++ b/assets/init
@@ -72,7 +72,7 @@ SMTP_HOST=${SMTP_HOST:-smtp.gmail.com}
 SMTP_PORT=${SMTP_PORT:-587}
 SMTP_USER=${SMTP_USER:-}
 SMTP_PASS=${SMTP_PASS:-}
-SMTP_OPENSSL_VERIFY_MODE=${SMTP_OPENSSL_VERIFY_MODE:-}
+SMTP_OPENSSL_VERIFY_MODE=${SMTP_OPENSSL_VERIFY_MODE:-peer}
 SMTP_STARTTLS=${SMTP_STARTTLS:-true}
 if [ -n "${SMTP_USER}" ]; then
   SMTP_ENABLED=${SMTP_ENABLED:-true}
@@ -476,12 +476,7 @@ if [ "${SMTP_ENABLED}" == "true" ]; then
 
   sudo -u git -H sed 's/{{SMTP_DOMAIN}}/'"${SMTP_DOMAIN}"'/' -i config/initializers/smtp_settings.rb
   sudo -u git -H sed 's/{{SMTP_STARTTLS}}/'"${SMTP_STARTTLS}"'/' -i config/initializers/smtp_settings.rb
-
-  if [ -n "${SMTP_OPENSSL_VERIFY_MODE}" ]; then
-    sudo -u git -H sed 's/{{SMTP_OPENSSL_VERIFY_MODE}}/'"${SMTP_OPENSSL_VERIFY_MODE}"'/' -i config/initializers/smtp_settings.rb
-  else
-    sudo -u git -H sed '/{{SMTP_OPENSSL_VERIFY_MODE}}/d' -i config/initializers/smtp_settings.rb
-  fi
+  sudo -u git -H sed 's/{{SMTP_OPENSSL_VERIFY_MODE}}/'"${SMTP_OPENSSL_VERIFY_MODE}"'/' -i config/initializers/smtp_settings.rb
 
   case "${SMTP_AUTHENTICATION}" in
     "") sudo -u git -H sed '/{{SMTP_AUTHENTICATION}}/d' -i config/initializers/smtp_settings.rb ;;