Verified Commit ec38bf63 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Remove redundant and out-of-date config, put compat level at top

parent c320eb45

conf/main.cf

+1 −12
Original line number Diff line number Diff line 
# See /usr/share/postfix/main.cf.dist for a commented, more complete version

compatibility_level = 2



# Host details

mydomain = kodo.org.uk

myhostname = smtp.$mydomain

myorigin = $mydomain

mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128

inet_interfaces = all



smtpd_banner = $myhostname ESMTP $mail_name

biff = no



# Template files

bounce_template_file = /etc/postfix/bounce.cf
@@ -53,10 +50,6 @@ smtpd_sender_restrictions = 
	reject_non_fqdn_sender,

	reject_unknown_sender_domain,

	permit

#smtpd_relay_restrictions =

#	permit_mynetworks,

#	permit_sasl_authenticated

#	reject

smtpd_recipient_restrictions =

	permit_mynetworks,

	permit_sasl_authenticated,
@@ -65,7 +58,6 @@ smtpd_recipient_restrictions = 
	defer_unauth_destination,

	check_policy_service unix:private/policy-spf

	permit

#	sleep 1, reject_unauth_pipelining,

smtpd_data_restrictions =

	reject_unauth_pipelining,

	permit
@@ -74,7 +66,6 @@ smtpd_data_restrictions = 
smtpd_tls_security_level = may

smtpd_tls_cert_file=/etc/tls/tls.crt

smtpd_tls_key_file=/etc/tls/tls.key

#smtpd_tls_CAfile=/etc/tls/tls.crt

smtpd_tls_mandatory_protocols = !SSLv3

smtpd_tls_mandatory_ciphers = high

smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
@@ -93,14 +84,12 @@ broken_sasl_auth_clients = no 
# All delivery is virtual, through dovecot LMTP

virtual_transport = lmtp:inet:dovecot.default.svc.cluster.local:63124

virtual_mailbox_domains = mysql:/etc/postfix/mysql_domains.cf

#virtual_alias_domains = mysql:/etc/postfix/mysql_domain_alias.cf

virtual_alias_maps = mysql:/etc/postfix/mysql_alias.cf

local_recipient_maps =

recipient_delimiter = +



# SPF policy server

policy-spf_time_limit = 300s

compatibility_level = 2



# Filtering

always_add_missing_headers = yes

conf/mysql_mailbox.cf

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
#

# This MySQL query must return the mailbox to route users' mail to, relative to 

# $virtual_mailbox_base. Additionally the mailbox must end with a '/' or emails 

# will be save to a concatenated file instead of individual files in 

# a directory.

#

# It takes the username resolved from mysql_alias.cf as the argument %s

#



dbname = app_accounts

query = 

  SELECT

    CONCAT(mailbox, '/')

  FROM

    users

  WHERE

    username = '%s'

    AND

    enabled = 1