From c6a45789bc091b701e201e3bf32694c7a69d21ba Mon Sep 17 00:00:00 2001 From: "Robert Foerster (Dessa)" Date: Fri, 30 Apr 2010 16:38:02 +0000 Subject: [PATCH] updated postfix configuration for debian lenny, ubuntu hardy and gentoo - split up postfix configs for courier and dovecot, so people do not do/install unneeded stuff - renamed deprecated config keys (upstream is backwards compatible until further notice, so you don't need to change them unless you really want to) - removed most default values, distros ship the default configs in /usr/share anyway. - debian etch is untouched, so is suse (for now) --- lib/configfiles/gentoo.inc.php | 49 ++++++++++-- lib/configfiles/hardy.inc.php | 49 +++++++++--- lib/configfiles/lenny.inc.php | 44 +++++++++-- .../postfix_courier/etc_postfix_main.cf | 77 +++++++++++++++++++ .../etc_postfix_mysql-virtual_alias_maps.cf | 0 ...c_postfix_mysql-virtual_mailbox_domains.cf | 0 .../etc_postfix_mysql-virtual_mailbox_maps.cf | 0 .../etc_postfix_sasl_smtpd.conf | 0 .../etc_postfix_main.cf | 29 +++---- .../etc_postfix_master.cf | 0 .../etc_postfix_mysql-virtual_alias_maps.cf | 0 ...c_postfix_mysql-virtual_mailbox_domains.cf | 0 .../etc_postfix_mysql-virtual_mailbox_maps.cf | 0 .../postfix_courier/etc_postfix_main.cf | 77 +++++++++++++++++++ .../etc_postfix_mysql-virtual_alias_maps.cf | 0 ...c_postfix_mysql-virtual_mailbox_domains.cf | 0 ...stfix_mysql-virtual_mailbox_limit_maps.cf} | 0 .../etc_postfix_mysql-virtual_mailbox_maps.cf | 0 .../etc_sasl2_smtpd.conf | 0 .../etc_postfix_main.cf | 16 ++-- .../etc_postfix_master.cf | 0 .../etc_postfix_mysql-virtual_alias_maps.cf | 8 ++ ...c_postfix_mysql-virtual_mailbox_domains.cf | 8 ++ ...ostfix_mysql-virtual_mailbox_limit_maps.cf | 7 ++ .../etc_postfix_mysql-virtual_mailbox_maps.cf | 7 ++ .../postfix_courier/etc_postfix_main.cf | 77 +++++++++++++++++++ .../etc_postfix_mysql-virtual_alias_maps.cf | 8 ++ ...c_postfix_mysql-virtual_mailbox_domains.cf | 8 ++ .../etc_postfix_mysql-virtual_mailbox_maps.cf | 7 ++ .../etc_postfix_sasl_smtpd.conf | 0 .../etc_postfix_main.cf | 35 +++------ .../etc_postfix_master.cf | 0 .../etc_postfix_mysql-virtual_alias_maps.cf | 8 ++ ...c_postfix_mysql-virtual_mailbox_domains.cf | 8 ++ .../etc_postfix_mysql-virtual_mailbox_maps.cf | 7 ++ 35 files changed, 455 insertions(+), 74 deletions(-) create mode 100644 templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_main.cf rename templates/misc/configfiles/debian_lenny/{postfix => postfix_courier}/etc_postfix_mysql-virtual_alias_maps.cf (100%) rename templates/misc/configfiles/debian_lenny/{postfix => postfix_courier}/etc_postfix_mysql-virtual_mailbox_domains.cf (100%) rename templates/misc/configfiles/debian_lenny/{postfix => postfix_courier}/etc_postfix_mysql-virtual_mailbox_maps.cf (100%) rename templates/misc/configfiles/debian_lenny/{postfix => postfix_courier}/etc_postfix_sasl_smtpd.conf (100%) rename templates/misc/configfiles/debian_lenny/{postfix => postfix_dovecot}/etc_postfix_main.cf (75%) rename templates/misc/configfiles/debian_lenny/{postfix => postfix_dovecot}/etc_postfix_master.cf (100%) rename templates/misc/configfiles/{gentoo/postfix => debian_lenny/postfix_dovecot}/etc_postfix_mysql-virtual_alias_maps.cf (100%) rename templates/misc/configfiles/{gentoo/postfix => debian_lenny/postfix_dovecot}/etc_postfix_mysql-virtual_mailbox_domains.cf (100%) rename templates/misc/configfiles/{gentoo/postfix => debian_lenny/postfix_dovecot}/etc_postfix_mysql-virtual_mailbox_maps.cf (100%) create mode 100644 templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_main.cf rename templates/misc/configfiles/{ubuntu_hardy/postfix => gentoo/postfix_courier}/etc_postfix_mysql-virtual_alias_maps.cf (100%) rename templates/misc/configfiles/{ubuntu_hardy/postfix => gentoo/postfix_courier}/etc_postfix_mysql-virtual_mailbox_domains.cf (100%) rename templates/misc/configfiles/gentoo/{postfix/mysql-virtual_mailbox_limit_maps.cf => postfix_courier/etc_postfix_mysql-virtual_mailbox_limit_maps.cf} (100%) rename templates/misc/configfiles/{ubuntu_hardy/postfix => gentoo/postfix_courier}/etc_postfix_mysql-virtual_mailbox_maps.cf (100%) rename templates/misc/configfiles/gentoo/{postfix => postfix_courier}/etc_sasl2_smtpd.conf (100%) rename templates/misc/configfiles/gentoo/{postfix => postfix_dovecot}/etc_postfix_main.cf (89%) rename templates/misc/configfiles/gentoo/{postfix => postfix_dovecot}/etc_postfix_master.cf (100%) create mode 100644 templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf create mode 100644 templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf create mode 100644 templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_limit_maps.cf create mode 100644 templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf create mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_main.cf create mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf create mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf create mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf rename templates/misc/configfiles/ubuntu_hardy/{postfix => postfix_courier}/etc_postfix_sasl_smtpd.conf (100%) rename templates/misc/configfiles/ubuntu_hardy/{postfix => postfix_dovecot}/etc_postfix_main.cf (70%) rename templates/misc/configfiles/ubuntu_hardy/{postfix => postfix_dovecot}/etc_postfix_master.cf (100%) create mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf create mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf create mode 100644 templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf diff --git a/lib/configfiles/gentoo.inc.php b/lib/configfiles/gentoo.inc.php index b81b0b8e..a4901c0d 100644 --- a/lib/configfiles/gentoo.inc.php +++ b/lib/configfiles/gentoo.inc.php @@ -89,9 +89,48 @@ return Array( 'smtp' => Array( 'label' => $lng['admin']['configfiles']['smtp'], 'daemons' => Array( - 'postfix' => Array( - 'label' => 'Postfix', + 'postfix_courier' => Array( + 'label' => 'Postfix/Courier', 'commands_1' => Array( + 'echo "mail-mta/postfix -dovecot-sasl sasl" >> /etc/portage/package.use', + 'emerge -av postfix', + 'mkdir -p ' . $settings['system']['vmail_homedir'], + 'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'], + 'chmod 0750 ' . $settings['system']['vmail_homedir'], + 'mv /etc/postfix/main.cf /etc/postfix/main.cf.gentoo', + 'touch /etc/postfix/main.cf', + 'touch /etc/postfix/mysql-virtual_alias_maps.cf', + 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', + 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', + 'touch /etc/sasl2/smtpd.conf', + 'chown root:root /etc/postfix/main.cf', + 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', + 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', + 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', + 'chown root:root /etc/sasl2/smtpd.conf', + 'chmod 0644 /etc/postfix/main.cf', + 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', + 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', + 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', + 'chmod 0600 /etc/sasl2/smtpd.conf', + ), + 'files' => Array( + 'etc_postfix_main.cf' => '/etc/postfix/main.cf', + 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', + 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', + 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', + 'etc_sasl2_smtpd.conf' => '/etc/sasl2/smtpd.conf' + ), + 'restart' => Array( + 'rc-update add postfix default', + '/etc/init.d/postfix restart' + ) + ), + 'postfix_dovecot' => Array( + 'label' => 'Postfix/Dovecot', + 'commands_1' => Array( + 'echo "mail-mta/postfix dovecot-sasl -sasl" >> /etc/portage/package.use', + 'emerge -av postfix', 'mkdir -p ' . $settings['system']['vmail_homedir'], 'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'], 'chmod 0750 ' . $settings['system']['vmail_homedir'], @@ -101,27 +140,23 @@ return Array( 'touch /etc/postfix/mysql-virtual_alias_maps.cf', 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'touch /etc/sasl2/smtpd.conf', 'chown root:root /etc/postfix/main.cf', 'chown root:root /etc/postfix/master.cf', 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chown root:root /etc/sasl2/smtpd.conf', 'chmod 0644 /etc/postfix/main.cf', 'chmod 0644 /etc/postfix/master.cf', 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', - 'chmod 0600 /etc/sasl2/smtpd.conf', ), 'files' => Array( 'etc_postfix_main.cf' => '/etc/postfix/main.cf', 'etc_postfix_master.cf' => '/etc/postfix/master.cf', 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', - 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', - 'etc_sasl2_smtpd.conf' => '/etc/sasl2/smtpd.conf' + 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf' ), 'restart' => Array( 'rc-update add postfix default', diff --git a/lib/configfiles/hardy.inc.php b/lib/configfiles/hardy.inc.php index 90b23346..0a81d816 100644 --- a/lib/configfiles/hardy.inc.php +++ b/lib/configfiles/hardy.inc.php @@ -95,30 +95,26 @@ return Array( 'smtp' => Array( 'label' => $lng['admin']['configfiles']['smtp'], 'daemons' => Array( - 'postfix' => Array( - 'label' => 'Postfix', - 'commands_1' => Array( - 'mkdir -p /etc/postfix/sasl', + 'postfix_courier' => Array( + 'label' => 'Postfix/Courier', + 'commands' => Array( + 'apt-get install postfix postfix-mysql libsasl2-2 libsasl2-modules libsasl2-modules-sql', 'mkdir -p /var/spool/postfix/etc/pam.d', 'mkdir -p /var/spool/postfix/var/run/mysqld', 'groupadd -g ' . $settings['system']['vmail_gid'] . ' vmail', 'useradd -u ' . $settings['system']['vmail_uid'] . ' -g vmail vmail', 'mkdir -p ' . $settings['system']['vmail_homedir'], 'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'], - 'mv /etc/postfix/main.cf /etc/postfix/main.cf.ubuntu', - 'touch /etc/postfix/main.cf', 'touch /etc/postfix/mysql-virtual_alias_maps.cf', 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', 'touch /etc/postfix/sasl/smtpd.conf', 'chown root:root /etc/postfix/main.cf', - 'chown root:root /etc/postfix/master.cf', 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', 'chown root:root /etc/postfix/sasl/smtpd.conf', 'chmod 0644 /etc/postfix/main.cf', - 'chmod 0644 /etc/postfix/master.cf', 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', @@ -126,7 +122,6 @@ return Array( ), 'files' => Array( 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_master.cf' => '/etc/postfix/master.cf', 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', @@ -137,6 +132,42 @@ return Array( 'newaliases' ) ), + 'postfix_dovecot' => Array( + 'label' => 'Postfix/Dovecot', + 'commands' => Array( + 'apt-get install postfix postfix-mysql', + 'mkdir -p /var/spool/postfix/etc/pam.d', + 'mkdir -p /var/spool/postfix/var/run/mysqld', + 'groupadd -g ' . $settings['system']['vmail_gid'] . ' vmail', + 'useradd -u ' . $settings['system']['vmail_uid'] . ' -g vmail vmail', + 'mkdir -p ' . $settings['system']['vmail_homedir'], + 'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'], + 'touch /etc/postfix/mysql-virtual_alias_maps.cf', + 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', + 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', + 'chown root:root /etc/postfix/main.cf', + 'chown root:root /etc/postfix/master.cf', + 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', + 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', + 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', + 'chmod 0644 /etc/postfix/main.cf', + 'chmod 0644 /etc/postfix/master.cf', + 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', + 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', + 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', + ), + 'files' => Array( + 'etc_postfix_main.cf' => '/etc/postfix/main.cf', + 'etc_postfix_master.cf' => '/etc/postfix/master.cf', + 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', + 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', + 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf' + ), + 'restart' => Array( + '/etc/init.d/postfix restart', + 'newaliases' + ) + ), 'postfix_mxaccess' => Array( 'label' => 'Postfix MX-Access (anti spam)', 'files' => Array( diff --git a/lib/configfiles/lenny.inc.php b/lib/configfiles/lenny.inc.php index 43d738fb..8930d20e 100644 --- a/lib/configfiles/lenny.inc.php +++ b/lib/configfiles/lenny.inc.php @@ -96,11 +96,10 @@ return Array( 'smtp' => Array( 'label' => $lng['admin']['configfiles']['smtp'], 'daemons' => Array( - 'postfix' => Array( - 'label' => 'Postfix', + 'postfix_courier' => Array( + 'label' => 'Postfix/Courier', 'commands' => Array( 'apt-get install postfix postfix-mysql libsasl2-2 libsasl2-modules libsasl2-modules-sql', - 'mkdir -p /etc/postfix/sasl', 'mkdir -p /var/spool/postfix/etc/pam.d', 'mkdir -p /var/spool/postfix/var/run/mysqld', 'groupadd -g ' . $settings['system']['vmail_gid'] . ' vmail', @@ -112,13 +111,11 @@ return Array( 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', 'touch /etc/postfix/sasl/smtpd.conf', 'chown root:root /etc/postfix/main.cf', - 'chown root:root /etc/postfix/master.cf', 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', 'chown root:root /etc/postfix/sasl/smtpd.conf', 'chmod 0644 /etc/postfix/main.cf', - 'chmod 0644 /etc/postfix/master.cf', 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', @@ -126,7 +123,6 @@ return Array( ), 'files' => Array( 'etc_postfix_main.cf' => '/etc/postfix/main.cf', - 'etc_postfix_master.cf' => '/etc/postfix/master.cf', 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf', @@ -137,6 +133,42 @@ return Array( 'newaliases' ) ), + 'postfix_dovecot' => Array( + 'label' => 'Postfix/Dovecot', + 'commands' => Array( + 'apt-get install postfix postfix-mysql', + 'mkdir -p /var/spool/postfix/etc/pam.d', + 'mkdir -p /var/spool/postfix/var/run/mysqld', + 'groupadd -g ' . $settings['system']['vmail_gid'] . ' vmail', + 'useradd -u ' . $settings['system']['vmail_uid'] . ' -g vmail vmail', + 'mkdir -p ' . $settings['system']['vmail_homedir'], + 'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'], + 'touch /etc/postfix/mysql-virtual_alias_maps.cf', + 'touch /etc/postfix/mysql-virtual_mailbox_domains.cf', + 'touch /etc/postfix/mysql-virtual_mailbox_maps.cf', + 'chown root:root /etc/postfix/main.cf', + 'chown root:root /etc/postfix/master.cf', + 'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf', + 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf', + 'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf', + 'chmod 0644 /etc/postfix/main.cf', + 'chmod 0644 /etc/postfix/master.cf', + 'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf', + 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf', + 'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf', + ), + 'files' => Array( + 'etc_postfix_main.cf' => '/etc/postfix/main.cf', + 'etc_postfix_master.cf' => '/etc/postfix/master.cf', + 'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf', + 'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf', + 'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf' + ), + 'restart' => Array( + '/etc/init.d/postfix restart', + 'newaliases' + ) + ), 'postfix_mxaccess' => Array( 'label' => 'Postfix MX-Access (anti spam)', 'files' => Array( diff --git a/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_main.cf b/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_main.cf new file mode 100644 index 00000000..c972687b --- /dev/null +++ b/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_main.cf @@ -0,0 +1,77 @@ +## General Postfix configuration +# should be the default domain from your provider eg. "server100.provider.tld" +mydomain = + +# should be different from $mydomain eg. "mail.$mydomain" +myhostname = + +mydestination = $myhostname, + $mydomain, + localhost.$myhostname, + localhost.$mydomain, + localhost +mynetworks = 127.0.0.0/8 +inet_interfaces = all +append_dot_mydomain = no +biff = no + +# Postfix performance settings +default_destination_concurrency_limit = 20 +local_destination_concurrency_limit = 2 + +# SMTPD Settings +smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU) +smtpd_helo_required = yes +smtpd_recipient_restrictions = permit_mynetworks, + permit_sasl_authenticated, + reject_unauth_destination, + reject_unauth_pipelining, + reject_non_fqdn_recipient +smtpd_sender_restrictions = permit_mynetworks, + permit_sasl_authenticated, + reject_unknown_helo_hostname, + reject_unknown_recipient_domain, + reject_unknown_sender_domain +smtpd_client_restrictions = permit_mynetworks, + permit_sasl_authenticated, + reject_unknown_client_hostname +# Maximum size of Message in bytes (50MB) +message_size_limit = 52428800 + +## SASL Auth Settings +smtpd_sasl_auth_enable = yes +smtpd_sasl_local_domain = $myhostname +broken_sasl_auth_clients = yes + +# Virtual delivery settings +virtual_mailbox_base = +virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf +virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf +virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf +virtual_uid_maps = static: +virtual_gid_maps = static: + +# Local delivery settings +local_transport = local +alias_maps = $alias_database + +# Default Mailbox size, is set to 0 which means unlimited! +mailbox_size_limit = 0 +virtual_mailbox_limit = 0 + +### TLS settings +### +## TLS for outgoing mails from the server to another server +#smtp_tls_security_level = may +#smtp_tls_note_starttls_offer = yes +## TLS for email client +#smtpd_tls_security_level = may +#smtpd_tls_cert_file = /etc/ssl/server/.pem +#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt +#smtpd_tls_loglevel = 1 +#smtpd_tls_received_header = yes + +debugger_command = + PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin + ddd $daemon_directory/$process_name $process_id & sleep 5 + diff --git a/templates/misc/configfiles/debian_lenny/postfix/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf similarity index 100% rename from templates/misc/configfiles/debian_lenny/postfix/etc_postfix_mysql-virtual_alias_maps.cf rename to templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf diff --git a/templates/misc/configfiles/debian_lenny/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf similarity index 100% rename from templates/misc/configfiles/debian_lenny/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf rename to templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf diff --git a/templates/misc/configfiles/debian_lenny/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf similarity index 100% rename from templates/misc/configfiles/debian_lenny/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf rename to templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf diff --git a/templates/misc/configfiles/debian_lenny/postfix/etc_postfix_sasl_smtpd.conf b/templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_sasl_smtpd.conf similarity index 100% rename from templates/misc/configfiles/debian_lenny/postfix/etc_postfix_sasl_smtpd.conf rename to templates/misc/configfiles/debian_lenny/postfix_courier/etc_postfix_sasl_smtpd.conf diff --git a/templates/misc/configfiles/debian_lenny/postfix/etc_postfix_main.cf b/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_main.cf similarity index 75% rename from templates/misc/configfiles/debian_lenny/postfix/etc_postfix_main.cf rename to templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_main.cf index f530110a..9efe93e1 100644 --- a/templates/misc/configfiles/debian_lenny/postfix/etc_postfix_main.cf +++ b/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_main.cf @@ -1,9 +1,3 @@ -# Postfix programs paths settings -command_directory = /usr/sbin -daemon_directory = /usr/lib/postfix -program_directory = /usr/lib/postfix -sendmail_path = /usr/sbin/sendmail - ## General Postfix configuration # should be the default domain from your provider eg. "server100.provider.tld" mydomain = @@ -35,25 +29,24 @@ smtpd_recipient_restrictions = permit_mynetworks, reject_non_fqdn_recipient smtpd_sender_restrictions = permit_mynetworks, permit_sasl_authenticated, - reject_unknown_hostname, + reject_unknown_helo_hostname, reject_unknown_recipient_domain, reject_unknown_sender_domain smtpd_client_restrictions = permit_mynetworks, permit_sasl_authenticated, - reject_unknown_client + reject_unknown_client_hostname # Maximum size of Message in bytes (50MB) message_size_limit = 52428800 ## SASL Auth Settings smtpd_sasl_auth_enable = yes smtpd_sasl_local_domain = $myhostname -smtpd_sasl_security_options = noanonymous broken_sasl_auth_clients = yes ## Dovecot Settings for deliver, SASL Auth and virtual transport -## uncomment those line to use Dovecot -#mailbox_command = /usr/lib/dovecot/deliver -#virtual_transport = dovecot -#dovecot_destination_recipient_limit = 1 +smtpd_sasl_type = dovecot +mailbox_command = /usr/lib/dovecot/deliver +virtual_transport = dovecot +dovecot_destination_recipient_limit = 1 # Virtual delivery settings virtual_mailbox_base = @@ -65,7 +58,6 @@ virtual_gid_maps = static: # Local delivery settings local_transport = local -alias_database = hash:/etc/aliases alias_maps = $alias_database # Default Mailbox size, is set to 0 which means unlimited! @@ -75,17 +67,14 @@ virtual_mailbox_limit = 0 ### TLS settings ### ## TLS for outgoing mails from the server to another server -#smtp_use_tls = yes +#smtp_tls_security_level = may #smtp_tls_note_starttls_offer = yes ## TLS for email client +#smtpd_tls_security_level = may #smtpd_tls_cert_file = /etc/ssl/server/.pem -#smtpd_tls_key_file = /etc/ssl/server/.pem -#smtpd_tls_CAfile = /etc/ssl/cacert.class3.crt # Just an example for CACert.org -#smtpd_tls_auth_only = no +#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt #smtpd_tls_loglevel = 1 #smtpd_tls_received_header = yes -#smtpd_tls_session_cache_timeout = 3600s -#tls_random_source = dev:/dev/urandom debugger_command = PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin diff --git a/templates/misc/configfiles/debian_lenny/postfix/etc_postfix_master.cf b/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_master.cf similarity index 100% rename from templates/misc/configfiles/debian_lenny/postfix/etc_postfix_master.cf rename to templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_master.cf diff --git a/templates/misc/configfiles/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf similarity index 100% rename from templates/misc/configfiles/gentoo/postfix/etc_postfix_mysql-virtual_alias_maps.cf rename to templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf diff --git a/templates/misc/configfiles/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf similarity index 100% rename from templates/misc/configfiles/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf rename to templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf diff --git a/templates/misc/configfiles/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf similarity index 100% rename from templates/misc/configfiles/gentoo/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf rename to templates/misc/configfiles/debian_lenny/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf diff --git a/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_main.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_main.cf new file mode 100644 index 00000000..84a3de61 --- /dev/null +++ b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_main.cf @@ -0,0 +1,77 @@ +## General Postfix configuration +# should be the default domain from your provider eg. "server100.provider.tld" +mydomain = + +# should be different from $mydomain eg. "mail.$mydomain" +myhostname = + +mydestination = $myhostname, + $mydomain, + localhost.$myhostname, + localhost.$mydomain, + localhost +mynetworks = 127.0.0.0/8 +inet_interfaces = all +append_dot_mydomain = no +biff = no + +# Postfix performance settings +default_destination_concurrency_limit = 20 +local_destination_concurrency_limit = 2 + +# SMTPD Settings +smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) +smtpd_helo_required = yes +smtpd_recipient_restrictions = permit_mynetworks, + permit_sasl_authenticated, + reject_unauth_destination, + reject_unauth_pipelining, + reject_non_fqdn_recipient +smtpd_sender_restrictions = permit_mynetworks, + permit_sasl_authenticated, + reject_unknown_helo_hostname, + reject_unknown_recipient_domain, + reject_unknown_sender_domain +smtpd_client_restrictions = permit_mynetworks, + permit_sasl_authenticated, + reject_unknown_client_hostname +# Maximum size of Message in bytes (50MB) +message_size_limit = 52428800 + +## SASL Auth Settings +smtpd_sasl_auth_enable = yes +smtpd_sasl_local_domain = $myhostname +broken_sasl_auth_clients = yes + +# Virtual delivery settings +virtual_mailbox_base = +virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf +virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf +virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf +virtual_uid_maps = static: +virtual_gid_maps = static: + +# Local delivery settings +local_transport = local +alias_maps = $alias_database + +# Default Mailbox size, is set to 0 which means unlimited! +mailbox_size_limit = 0 +virtual_mailbox_limit = 0 + +### TLS settings +### +## TLS for outgoing mails from the server to another server +#smtp_tls_security_level = may +#smtp_tls_note_starttls_offer = yes +## TLS for email client +#smtpd_tls_security_level = may +#smtpd_tls_cert_file = /etc/ssl/server/.pem +#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt +#smtpd_tls_loglevel = 1 +#smtpd_tls_received_header = yes + +debugger_command = + PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin + ddd $daemon_directory/$process_name $process_id & sleep 5 + diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf similarity index 100% rename from templates/misc/configfiles/ubuntu_hardy/postfix/etc_postfix_mysql-virtual_alias_maps.cf rename to templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf similarity index 100% rename from templates/misc/configfiles/ubuntu_hardy/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf rename to templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf diff --git a/templates/misc/configfiles/gentoo/postfix/mysql-virtual_mailbox_limit_maps.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_limit_maps.cf similarity index 100% rename from templates/misc/configfiles/gentoo/postfix/mysql-virtual_mailbox_limit_maps.cf rename to templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_limit_maps.cf diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf similarity index 100% rename from templates/misc/configfiles/ubuntu_hardy/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf rename to templates/misc/configfiles/gentoo/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf diff --git a/templates/misc/configfiles/gentoo/postfix/etc_sasl2_smtpd.conf b/templates/misc/configfiles/gentoo/postfix_courier/etc_sasl2_smtpd.conf similarity index 100% rename from templates/misc/configfiles/gentoo/postfix/etc_sasl2_smtpd.conf rename to templates/misc/configfiles/gentoo/postfix_courier/etc_sasl2_smtpd.conf diff --git a/templates/misc/configfiles/gentoo/postfix/etc_postfix_main.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_main.cf similarity index 89% rename from templates/misc/configfiles/gentoo/postfix/etc_postfix_main.cf rename to templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_main.cf index 118bd4d8..2c834ea2 100644 --- a/templates/misc/configfiles/gentoo/postfix/etc_postfix_main.cf +++ b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_main.cf @@ -50,12 +50,10 @@ smtpd_sasl_local_domain = $myhostname smtpd_sasl_security_options = noanonymous broken_sasl_auth_clients = yes ## Dovecot Settings for deliver, SASL Auth and virtual transport -## uncomment those line to use Dovecot -#mailbox_command = /usr/libexec/dovecot/deliver -#smtpd_sasl_type = dovecot -#smtpd_sasl_path = private/auth -#virtual_transport = dovecot -#dovecot_destination_recipient_limit = 1 +mailbox_command = /usr/libexec/dovecot/deliver +smtpd_sasl_path = private/auth +virtual_transport = dovecot +dovecot_destination_recipient_limit = 1 # Virtual delivery settings virtual_mailbox_base = @@ -90,14 +88,14 @@ virtual_mailbox_limit = 0 #tls_random_source = dev:/dev/urandom ### Quota Settings with vda useflag -## I use only virtual as localdelivery... This permit me to have full -## virtual domain hosting without using a lots of maps +## I use only virtual as localdelivery... This permits me to have full +## virtual domain hosting without using a lot of maps #virtual_transport = virtual ## Generate maildirsize files or not #virtual_create_maildirsize = yes ## I use Courier IMAP compatibles files. #virtual_mailbox_extended = yes -## Limits only INBOX part (usefull when +## Limits only INBOX part (useful when ## using when you have IMAP users) #virtual_mailbox_limit_inbox = yes ## maps of soft disk quotas diff --git a/templates/misc/configfiles/gentoo/postfix/etc_postfix_master.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_master.cf similarity index 100% rename from templates/misc/configfiles/gentoo/postfix/etc_postfix_master.cf rename to templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_master.cf diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf new file mode 100644 index 00000000..a9e71f83 --- /dev/null +++ b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf @@ -0,0 +1,8 @@ +user = +password = +dbname = +table = mail_virtual +select_field = destination +where_field = email +additional_conditions = and TRIM(destination) <> '' +hosts = diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf new file mode 100644 index 00000000..4484bee2 --- /dev/null +++ b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf @@ -0,0 +1,8 @@ +user = +password = +dbname = +table = panel_domains +select_field = domain +where_field = domain +additional_conditions = and isemaildomain = '1' +hosts = diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_limit_maps.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_limit_maps.cf new file mode 100644 index 00000000..03c191ac --- /dev/null +++ b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_limit_maps.cf @@ -0,0 +1,7 @@ +user = +password = +dbname = +table = mail_users +select_field = (quota*1024*1024) +where_field = email +hosts = \ No newline at end of file diff --git a/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf new file mode 100644 index 00000000..7e0f79af --- /dev/null +++ b/templates/misc/configfiles/gentoo/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf @@ -0,0 +1,7 @@ +user = +password = +dbname = +table = mail_users +select_field = maildir +where_field = email +hosts = diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_main.cf new file mode 100644 index 00000000..428048bf --- /dev/null +++ b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_main.cf @@ -0,0 +1,77 @@ +## General Postfix configuration +# should be the default domain from your provider eg. "server100.provider.tld" +mydomain = + +# should be different from $mydomain eg. "mail.$mydomain" +myhostname = + +mydestination = $myhostname, + $mydomain, + localhost.$myhostname, + localhost.$mydomain, + localhost +mynetworks = 127.0.0.0/8 +inet_interfaces = all +append_dot_mydomain = no +biff = no + +# Postfix performance settings +default_destination_concurrency_limit = 20 +local_destination_concurrency_limit = 2 + +# SMTPD Settings +smtpd_banner = $myhostname ESMTP $mail_name (Ubuntu) +smtpd_helo_required = yes +smtpd_recipient_restrictions = permit_mynetworks, + permit_sasl_authenticated, + reject_unauth_destination, + reject_unauth_pipelining, + reject_non_fqdn_recipient +smtpd_sender_restrictions = permit_mynetworks, + permit_sasl_authenticated, + reject_unknown_helo_hostname, + reject_unknown_recipient_domain, + reject_unknown_sender_domain +smtpd_client_restrictions = permit_mynetworks, + permit_sasl_authenticated, + reject_unknown_client_hostname +# Maximum size of Message in bytes (50MB) +message_size_limit = 52428800 + +## SASL Auth Settings +smtpd_sasl_auth_enable = yes +smtpd_sasl_local_domain = $myhostname +broken_sasl_auth_clients = yes + +# Virtual delivery settings +virtual_mailbox_base = +virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf +virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf +virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf +virtual_uid_maps = static: +virtual_gid_maps = static: + +# Local delivery settings +local_transport = local +alias_maps = $alias_database + +# Default Mailbox size, is set to 0 which means unlimited! +mailbox_size_limit = 0 +virtual_mailbox_limit = 0 + +### TLS settings +### +## TLS for outgoing mails from the server to another server +#smtp_tls_security_level = may +#smtp_tls_note_starttls_offer = yes +## TLS for email client +#smtpd_tls_security_level = may +#smtpd_tls_cert_file = /etc/ssl/server/.pem +#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt +#smtpd_tls_loglevel = 1 +#smtpd_tls_received_header = yes + +debugger_command = + PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin + ddd $daemon_directory/$process_name $process_id & sleep 5 + diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf new file mode 100644 index 00000000..a9e71f83 --- /dev/null +++ b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_alias_maps.cf @@ -0,0 +1,8 @@ +user = +password = +dbname = +table = mail_virtual +select_field = destination +where_field = email +additional_conditions = and TRIM(destination) <> '' +hosts = diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf new file mode 100644 index 00000000..4484bee2 --- /dev/null +++ b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_domains.cf @@ -0,0 +1,8 @@ +user = +password = +dbname = +table = panel_domains +select_field = domain +where_field = domain +additional_conditions = and isemaildomain = '1' +hosts = diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf new file mode 100644 index 00000000..7e0f79af --- /dev/null +++ b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_mysql-virtual_mailbox_maps.cf @@ -0,0 +1,7 @@ +user = +password = +dbname = +table = mail_users +select_field = maildir +where_field = email +hosts = diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix/etc_postfix_sasl_smtpd.conf b/templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_sasl_smtpd.conf similarity index 100% rename from templates/misc/configfiles/ubuntu_hardy/postfix/etc_postfix_sasl_smtpd.conf rename to templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_sasl_smtpd.conf diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix/etc_postfix_main.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_main.cf similarity index 70% rename from templates/misc/configfiles/ubuntu_hardy/postfix/etc_postfix_main.cf rename to templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_main.cf index e0bc9770..e051e836 100644 --- a/templates/misc/configfiles/ubuntu_hardy/postfix/etc_postfix_main.cf +++ b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_main.cf @@ -1,15 +1,9 @@ -# Postfix programs paths settings -command_directory = /usr/sbin -daemon_directory = /usr/lib/postfix -program_directory = /usr/lib/postfix -sendmail_path = /usr/sbin/sendmail - ## General Postfix configuration # should be the default domain from your provider eg. "server100.provider.tld" mydomain = # should be different from $mydomain eg. "mail.$mydomain" -myhostname = mail. +myhostname = mydestination = $myhostname, $mydomain, @@ -26,7 +20,7 @@ default_destination_concurrency_limit = 20 local_destination_concurrency_limit = 2 # SMTPD Settings -smtpd_banner = $myhostname ESMTP $mail_name (Ubuntu/GNU) +smtpd_banner = $myhostname ESMTP $mail_name (Ubuntu) smtpd_helo_required = yes smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, @@ -35,25 +29,24 @@ smtpd_recipient_restrictions = permit_mynetworks, reject_non_fqdn_recipient smtpd_sender_restrictions = permit_mynetworks, permit_sasl_authenticated, - reject_unknown_hostname, + reject_unknown_helo_hostname, reject_unknown_recipient_domain, reject_unknown_sender_domain smtpd_client_restrictions = permit_mynetworks, permit_sasl_authenticated, - reject_unknown_client + reject_unknown_client_hostname # Maximum size of Message in bytes (50MB) message_size_limit = 52428800 ## SASL Auth Settings smtpd_sasl_auth_enable = yes smtpd_sasl_local_domain = $myhostname -smtpd_sasl_security_options = noanonymous broken_sasl_auth_clients = yes ## Dovecot Settings for deliver, SASL Auth and virtual transport -## uncomment those line to use Dovecot -#mailbox_command = /usr/lib/dovecot/deliver -#virtual_transport = dovecot -#dovecot_destination_recipient_limit = 1 +smtpd_sasl_type = dovecot +mailbox_command = /usr/lib/dovecot/deliver +virtual_transport = dovecot +dovecot_destination_recipient_limit = 1 # Virtual delivery settings virtual_mailbox_base = @@ -65,7 +58,6 @@ virtual_gid_maps = static: # Local delivery settings local_transport = local -alias_database = hash:/etc/aliases alias_maps = $alias_database # Default Mailbox size, is set to 0 which means unlimited! @@ -75,17 +67,14 @@ virtual_mailbox_limit = 0 ### TLS settings ### ## TLS for outgoing mails from the server to another server -#smtp_use_tls = yes +#smtp_tls_security_level = may #smtp_tls_note_starttls_offer = yes ## TLS for email client -#smtpd_tls_cert_file = /etc/ssl/server/.crt -#smtpd_tls_key_file = /etc/ssl/server/.key -#smtpd_tls_CAfile = /etc/ssl/cacert.class3.crt # Just an example for CACert.org -#smtpd_tls_auth_only = no +#smtpd_tls_security_level = may +#smtpd_tls_cert_file = /etc/ssl/server/.pem +#smtpd_tls_CAfile = /etc/ssl/certs/ca-certificates.crt #smtpd_tls_loglevel = 1 #smtpd_tls_received_header = yes -#smtpd_tls_session_cache_timeout = 3600s -#tls_random_source = dev:/dev/urandom debugger_command = PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix/etc_postfix_master.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_master.cf similarity index 100% rename from templates/misc/configfiles/ubuntu_hardy/postfix/etc_postfix_master.cf rename to templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_master.cf diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf new file mode 100644 index 00000000..a9e71f83 --- /dev/null +++ b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_alias_maps.cf @@ -0,0 +1,8 @@ +user = +password = +dbname = +table = mail_virtual +select_field = destination +where_field = email +additional_conditions = and TRIM(destination) <> '' +hosts = diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf new file mode 100644 index 00000000..4484bee2 --- /dev/null +++ b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_domains.cf @@ -0,0 +1,8 @@ +user = +password = +dbname = +table = panel_domains +select_field = domain +where_field = domain +additional_conditions = and isemaildomain = '1' +hosts = diff --git a/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf new file mode 100644 index 00000000..7e0f79af --- /dev/null +++ b/templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_mysql-virtual_mailbox_maps.cf @@ -0,0 +1,7 @@ +user = +password = +dbname = +table = mail_users +select_field = maildir +where_field = email +hosts =