diff options
| -rw-r--r-- | src/main/distrib/data/gitblit.properties | 3 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/MailExecutor.java | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties index 0fc1780f..36d78035 100644 --- a/src/main/distrib/data/gitblit.properties +++ b/src/main/distrib/data/gitblit.properties @@ -943,6 +943,9 @@ mail.port = 25 # SINCE 0.6.0
mail.debug = false
+# use SMTPs flag
+mail.smtps = false
+
# if your smtp server requires authentication, supply the credentials here
#
# SINCE 0.6.0
diff --git a/src/main/java/com/gitblit/MailExecutor.java b/src/main/java/com/gitblit/MailExecutor.java index 54ff8b82..c4e776a9 100644 --- a/src/main/java/com/gitblit/MailExecutor.java +++ b/src/main/java/com/gitblit/MailExecutor.java @@ -60,6 +60,7 @@ public class MailExecutor implements Runnable { final String mailUser = settings.getString(Keys.mail.username, null);
final String mailPassword = settings.getString(Keys.mail.password, null);
+ final boolean smtps = settings.getBoolean(Keys.mail.smtps, false);
boolean authenticate = !StringUtils.isEmpty(mailUser) && !StringUtils.isEmpty(mailPassword);
String server = settings.getString(Keys.mail.server, "");
if (StringUtils.isEmpty(server)) {
@@ -79,7 +80,7 @@ public class MailExecutor implements Runnable { props.setProperty("mail.smtp.auth", String.valueOf(authenticate));
props.setProperty("mail.smtp.auths", String.valueOf(authenticate));
- if (isGMail) {
+ if (isGMail || smtps) {
props.setProperty("mail.smtp.starttls.enable", "true");
props.put("mail.smtp.socketFactory.port", String.valueOf(port));
props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
|