manhole
2013-06-07 14a770319cdaf43b64278ffa45d5dad1ebb7b244
SMTPs mailserver available (not only gmail)
2 files modified
6 ■■■■ changed files
src/main/distrib/data/gitblit.properties 3 ●●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/MailExecutor.java 3 ●●●● patch | view | raw | blame | history
src/main/distrib/data/gitblit.properties
@@ -943,6 +943,9 @@
# 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
src/main/java/com/gitblit/MailExecutor.java
@@ -60,6 +60,7 @@
        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 @@
        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");