Browse Source

Merge pull request #560 from mikeashley/submission-port

Use submission port for client outgoing email
Mike Ashley 8 years ago
parent
commit
2ebd32acb1

+ 7
- 6
roles/mailserver/files/etc_postfix_master.cf View File

13
 smtpd      pass  -       -       -       -       -       smtpd
13
 smtpd      pass  -       -       -       -       -       smtpd
14
 dnsblog    unix  -       -       -       -       0       dnsblog
14
 dnsblog    unix  -       -       -       -       0       dnsblog
15
 tlsproxy   unix  -       -       -       -       0       tlsproxy
15
 tlsproxy   unix  -       -       -       -       0       tlsproxy
16
-#submission inet  n       -       -       -       -       smtpd
17
-#  -o syslog_name=postfix/submission
18
-#  -o smtpd_tls_security_level=encrypt
19
-#  -o smtpd_etrn_restrictions=reject
20
-#  -o smtpd_client_restrictions=permit_sasl_authenticated,reject
21
-#  -o milter_macro_daemon_name=ORIGINATING
16
+submission inet  n       -       -       -       -       smtpd
17
+  -o syslog_name=postfix/submission
18
+  -o smtpd_tls_security_level=encrypt
19
+  -o smtpd_etrn_restrictions=reject
20
+  -o smtpd_client_restrictions=permit_sasl_authenticated,reject_unauth_destination,reject
21
+  -o smtpd_sasl_security_options=noanonymous,noplaintext
22
+  -o smtpd_sasl_tls_security_options=noanonymous
22
 
23
 
23
 # SMTP over SSL/TLS on port 465.
24
 # SMTP over SSL/TLS on port 465.
24
 smtps     inet  n       -       -       -       -       smtpd
25
 smtps     inet  n       -       -       -       -       smtpd

+ 1
- 0
roles/mailserver/tasks/postfix.yml View File

63
   with_items:
63
   with_items:
64
     - smtp
64
     - smtp
65
     - ssmtp
65
     - ssmtp
66
+    - submission
66
   tags: ufw
67
   tags: ufw

+ 2
- 2
roles/mailserver/templates/var_www_autoconfig_mail_config-v1.1.j2 View File

20
         </incomingServer>
20
         </incomingServer>
21
         <outgoingServer type="smtp">
21
         <outgoingServer type="smtp">
22
             <hostname>{{ mail_server_hostname }}</hostname>
22
             <hostname>{{ mail_server_hostname }}</hostname>
23
-            <port>465</port>
24
-            <socketType>SSL</socketType>
23
+            <port>587</port>
24
+            <socketType>STARTTLS</socketType>
25
             <authentication>password-cleartext</authentication>
25
             <authentication>password-cleartext</authentication>
26
             <username>%EMAILADDRESS%</username>
26
             <username>%EMAILADDRESS%</username>
27
         </outgoingServer>
27
         </outgoingServer>

Loading…
Cancel
Save