From deb58f07341ee3c79faccb929c7dc23d43cecd4e Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Fri, 12 Jul 2013 10:56:16 -0400
Subject: [PATCH] - Moved postfix postconf lines (only those executed on update, too) to template file

---
 install/tpl/debian_postfix.conf.master   |   33 ++++++
 install/lib/installer_base.lib.php       |   46 ++-------
 install/dist/lib/fedora.lib.php          |   42 ++------
 install/dist/lib/gentoo.lib.php          |   38 +-----
 install/dist/lib/opensuse.lib.php        |   40 +------
 install/tpl/fedora_postfix.conf.master   |   30 ++++++
 install/tpl/opensuse_postfix.conf.master |   30 ++++++
 install/tpl/gentoo_postfix.conf.master   |   30 ++++++
 8 files changed, 161 insertions(+), 128 deletions(-)

diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index d173a0e..a0136f6 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -166,38 +166,16 @@
 		if(!is_user($cf['vmail_username'])) caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");		
 
 		//* These postconf commands will be executed on installation and update
-		$postconf_commands = array (
-			'virtual_alias_domains =',
-			'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, mysql:'.$config_dir.'/mysql-virtual_email2email.cf',
-			'virtual_mailbox_domains = proxy:mysql:'.$config_dir.'/mysql-virtual_domains.cf',
-			'virtual_mailbox_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailboxes.cf',
-			'virtual_mailbox_base = '.$cf['vmail_mailbox_base'],
-			'virtual_uid_maps = static:'.$cf['vmail_userid'],
-			'virtual_gid_maps = static:'.$cf['vmail_groupid'],
-			'smtpd_sasl_auth_enable = yes',
-			'broken_sasl_auth_clients = yes',
-			'smtpd_sasl_authenticated_header = yes',
-			'smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, check_recipient_access mysql:'.$config_dir.'/mysql-virtual_recipient.cf, reject_unauth_destination',
-			'smtpd_use_tls = yes',
-			'smtpd_tls_security_level = may',
-			'smtpd_tls_cert_file = '.$config_dir.'/smtpd.cert',
-			'smtpd_tls_key_file = '.$config_dir.'/smtpd.key',
-			'transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf',
-			'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf',
-			'relay_recipient_maps = mysql:'.$config_dir.'/mysql-virtual_relayrecipientmaps.cf',
-			'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps',
-			'smtpd_sender_restrictions = check_sender_access mysql:'.$config_dir.'/mysql-virtual_sender.cf',
-			'smtpd_client_restrictions = check_client_access mysql:'.$config_dir.'/mysql-virtual_client.cf',
-			'maildrop_destination_concurrency_limit = 1',
-			'maildrop_destination_recipient_limit   = 1',
-			'virtual_transport = maildrop',
-			'header_checks = regexp:'.$config_dir.'/header_checks',
-			'mime_header_checks = regexp:'.$config_dir.'/mime_header_checks',
-			'nested_header_checks = regexp:'.$config_dir.'/nested_header_checks',
-			'body_checks = regexp:'.$config_dir.'/body_checks',
-			'inet_interfaces = all'
-		);
-		
+        $postconf_placeholders = array('{config_dir}' => $config_dir,
+                                       '{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
+                                       '{vmail_userid}' => $cf['vmail_userid'],
+                                       '{vmail_groupid}' => $cf['vmail_groupid'],
+                                       '{rbl_list}' => $rbl_list);
+        
+        $postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_postfix.conf.master', 'tpl/fedora_postfix.conf.master');
+        $postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);
+        $postconf_commands = array_filter(explode("\n", $postconf_tpl)); // read and remove empty lines
+        
 		//* These postconf commands will be executed on installation only
 		if($this->is_update == false) {
 			$postconf_commands = array_merge($postconf_commands,array(
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index 194c837..382689c 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -81,35 +81,15 @@
 		}
 
 		//* These postconf commands will be executed on installation and update
-		$postconf_commands = array (
-			'virtual_alias_domains =',
-			'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, mysql:'.$config_dir.'/mysql-virtual_email2email.cf',
-			'virtual_mailbox_domains = proxy:mysql:'.$config_dir.'/mysql-virtual_domains.cf',
-			'virtual_mailbox_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailboxes.cf',
-			'virtual_mailbox_base = '.$cf['vmail_mailbox_base'],
-			'virtual_uid_maps = static:'.$cf['vmail_userid'],
-			'virtual_gid_maps = static:'.$cf['vmail_groupid'],
-			'smtpd_sasl_auth_enable = yes',
-			'broken_sasl_auth_clients = yes',
-			'smtpd_sasl_authenticated_header = yes',
-			'smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, check_recipient_access mysql:'.$config_dir.'/mysql-virtual_recipient.cf, reject_unauth_destination',
-			'smtpd_use_tls = yes',
-			'smtpd_tls_security_level = may',
-			'smtpd_tls_cert_file = '.$config_dir.'/smtpd.cert',
-			'smtpd_tls_key_file = '.$config_dir.'/smtpd.key',
-			'transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf',
-			'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf',
-			'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps',
-			'smtpd_sender_restrictions = check_sender_access mysql:'.$config_dir.'/mysql-virtual_sender.cf',
-			'smtpd_client_restrictions = check_client_access mysql:'.$config_dir.'/mysql-virtual_client.cf',
-			'maildrop_destination_concurrency_limit = 1',
-			'maildrop_destination_recipient_limit   = 1',
-			'virtual_transport = maildrop',
-			'header_checks = regexp:'.$config_dir.'/header_checks',
-			'mime_header_checks = regexp:'.$config_dir.'/mime_header_checks',
-			'nested_header_checks = regexp:'.$config_dir.'/nested_header_checks',
-			'body_checks = regexp:'.$config_dir.'/body_checks'
-		);
+        $postconf_placeholders = array('{config_dir}' => $config_dir,
+                                       '{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
+                                       '{vmail_userid}' => $cf['vmail_userid'],
+                                       '{vmail_groupid}' => $cf['vmail_groupid'],
+                                       '{rbl_list}' => $rbl_list);
+        
+        $postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/gentoo_postfix.conf.master', 'tpl/gentoo_postfix.conf.master');
+        $postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);
+        $postconf_commands = array_filter(explode("\n", $postconf_tpl)); // read and remove empty lines
 		
 		//* These postconf commands will be executed on installation only
 		if($this->is_update == false) {
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 5a92970..57b2cd6 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -179,37 +179,15 @@
 		if($cf['vmail_mailbox_base'] != '' && strlen($cf['vmail_mailbox_base']) >= 10 && $this->is_update === false) exec('chown -R '.$cf['vmail_username'].':'.$cf['vmail_groupname'].' '.$cf['vmail_mailbox_base']);
 		
 		//* These postconf commands will be executed on installation and update
-		$postconf_commands = array (
-			'virtual_alias_domains =',
-			'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, mysql:'.$config_dir.'/mysql-virtual_email2email.cf',
-			'virtual_mailbox_domains = proxy:mysql:'.$config_dir.'/mysql-virtual_domains.cf',
-			'virtual_mailbox_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailboxes.cf',
-			'virtual_mailbox_base = '.$cf['vmail_mailbox_base'],
-			'virtual_uid_maps = static:'.$cf['vmail_userid'],
-			'virtual_gid_maps = static:'.$cf['vmail_groupid'],
-			'smtpd_sasl_auth_enable = yes',
-			'broken_sasl_auth_clients = yes',
-			'smtpd_sasl_authenticated_header = yes',
-			'smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, check_recipient_access mysql:'.$config_dir.'/mysql-virtual_recipient.cf, reject_unauth_destination',
-			'smtpd_use_tls = yes',
-			'smtpd_tls_security_level = may',
-			'smtpd_tls_cert_file = '.$config_dir.'/smtpd.cert',
-			'smtpd_tls_key_file = '.$config_dir.'/smtpd.key',
-			'transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf',
-			'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf',
-			'relay_recipient_maps = mysql:'.$config_dir.'/mysql-virtual_relayrecipientmaps.cf',
-			'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps',
-			'smtpd_sender_restrictions = check_sender_access mysql:'.$config_dir.'/mysql-virtual_sender.cf',
-			'smtpd_client_restrictions = check_client_access mysql:'.$config_dir.'/mysql-virtual_client.cf',
-			'maildrop_destination_concurrency_limit = 1',
-			'maildrop_destination_recipient_limit   = 1',
-			'virtual_transport = maildrop',
-			'header_checks = regexp:'.$config_dir.'/header_checks',
-			'mime_header_checks = regexp:'.$config_dir.'/mime_header_checks',
-			'nested_header_checks = regexp:'.$config_dir.'/nested_header_checks',
-			'body_checks = regexp:'.$config_dir.'/body_checks',
-			'inet_interfaces = all'
-		);
+        $postconf_placeholders = array('{config_dir}' => $config_dir,
+                                       '{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
+                                       '{vmail_userid}' => $cf['vmail_userid'],
+                                       '{vmail_groupid}' => $cf['vmail_groupid'],
+                                       '{rbl_list}' => $rbl_list);
+        
+        $postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/opensuse_postfix.conf.master', 'tpl/opensuse_postfix.conf.master');
+        $postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);
+        $postconf_commands = array_filter(explode("\n", $postconf_tpl)); // read and remove empty lines
 		
 		//* These postconf commands will be executed on installation only
 		if($this->is_update == false) {
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index da7b8c0..0684b41 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -693,42 +693,16 @@
 		}
 		unset($rbl_hosts);
 		unset($server_ini_array);
-
-		$postconf_commands = array (
-				'alias_maps = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases',
-				'alias_database = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases',
-				'virtual_alias_domains =',
-				'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, proxy:mysql:'.$config_dir.'/mysql-virtual_email2email.cf, hash:/var/lib/mailman/data/virtual-mailman',
-				'virtual_mailbox_domains = proxy:mysql:'.$config_dir.'/mysql-virtual_domains.cf',
-				'virtual_mailbox_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailboxes.cf',
-				'virtual_mailbox_base = '.$cf['vmail_mailbox_base'],
-				'virtual_uid_maps = static:'.$cf['vmail_userid'],
-				'virtual_gid_maps = static:'.$cf['vmail_groupid'],
-				'inet_protocols=all',
-				'smtpd_sasl_auth_enable = yes',
-				'broken_sasl_auth_clients = yes',
-				'smtpd_sasl_authenticated_header = yes',
-				'smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, check_recipient_access mysql:'.$config_dir.'/mysql-virtual_recipient.cf, reject_unauth_destination'. $rbl_list,
-				'smtpd_use_tls = yes',
-				'smtpd_tls_security_level = may',
-				'smtpd_tls_cert_file = '.$config_dir.'/smtpd.cert',
-				'smtpd_tls_key_file = '.$config_dir.'/smtpd.key',
-				'transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf',
-				'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf',
-				'relay_recipient_maps = mysql:'.$config_dir.'/mysql-virtual_relayrecipientmaps.cf',
-				'proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps',
-				'smtpd_sender_restrictions = check_sender_access mysql:'.$config_dir.'/mysql-virtual_sender.cf',
-				'smtpd_client_restrictions = check_client_access mysql:'.$config_dir.'/mysql-virtual_client.cf',
-				'smtpd_client_message_rate_limit = 100',
-				'maildrop_destination_concurrency_limit = 1',
-				'maildrop_destination_recipient_limit   = 1',
-				'virtual_transport = maildrop',
-				'header_checks = regexp:'.$config_dir.'/header_checks',
-				'mime_header_checks = regexp:'.$config_dir.'/mime_header_checks',
-				'nested_header_checks = regexp:'.$config_dir.'/nested_header_checks',
-				'body_checks = regexp:'.$config_dir.'/body_checks',
-				'owner_request_special = no'
-		);
+        
+        $postconf_placeholders = array('{config_dir}' => $config_dir,
+                                       '{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
+                                       '{vmail_userid}' => $cf['vmail_userid'],
+                                       '{vmail_groupid}' => $cf['vmail_groupid'],
+                                       '{rbl_list}' => $rbl_list);
+        
+        $postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_postfix.conf.master', 'tpl/debian_postfix.conf.master');
+        $postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);
+        $postconf_commands = array_filter(explode("\n", $postconf_tpl)); // read and remove empty lines
 
 		//* These postconf commands will be executed on installation only
 		if($this->is_update == false) {
diff --git a/install/tpl/debian_postfix.conf.master b/install/tpl/debian_postfix.conf.master
new file mode 100644
index 0000000..85f5d07
--- /dev/null
+++ b/install/tpl/debian_postfix.conf.master
@@ -0,0 +1,33 @@
+alias_maps = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases
+alias_database = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases
+virtual_alias_domains =
+virtual_alias_maps = proxy:mysql:{config_dir}/mysql-virtual_forwardings.cf, proxy:mysql:{config_dir}/mysql-virtual_email2email.cf, hash:/var/lib/mailman/data/virtual-mailman
+virtual_mailbox_domains = proxy:mysql:{config_dir}/mysql-virtual_domains.cf
+virtual_mailbox_maps = proxy:mysql:{config_dir}/mysql-virtual_mailboxes.cf
+virtual_mailbox_base = {vmail_mailbox_base}
+virtual_uid_maps = static:{vmail_userid}
+virtual_gid_maps = static:{vmail_groupid}
+inet_protocols=all
+smtpd_sasl_auth_enable = yes
+broken_sasl_auth_clients = yes
+smtpd_sasl_authenticated_header = yes
+smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf, reject_unauth_destination{rbl_list}
+smtpd_use_tls = yes
+smtpd_tls_security_level = may
+smtpd_tls_cert_file = {config_dir}/smtpd.cert
+smtpd_tls_key_file = {config_dir}/smtpd.key
+transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:{config_dir}/mysql-virtual_transports.cf
+relay_domains = mysql:{config_dir}/mysql-virtual_relaydomains.cf
+relay_recipient_maps = mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
+proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps
+smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf
+smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
+smtpd_client_message_rate_limit = 100
+maildrop_destination_concurrency_limit = 1
+maildrop_destination_recipient_limit   = 1
+virtual_transport = maildrop
+header_checks = regexp:{config_dir}/header_checks
+mime_header_checks = regexp:{config_dir}/mime_header_checks
+nested_header_checks = regexp:{config_dir}/nested_header_checks
+body_checks = regexp:{config_dir}/body_checks
+owner_request_special = no
\ No newline at end of file
diff --git a/install/tpl/fedora_postfix.conf.master b/install/tpl/fedora_postfix.conf.master
new file mode 100644
index 0000000..c84bd11
--- /dev/null
+++ b/install/tpl/fedora_postfix.conf.master
@@ -0,0 +1,30 @@
+virtual_alias_domains =
+virtual_alias_maps = proxy:mysql:{config_dir}/mysql-virtual_forwardings.cf, proxy:mysql:{config_dir}/mysql-virtual_email2email.cf
+virtual_mailbox_domains = proxy:mysql:{config_dir}/mysql-virtual_domains.cf
+virtual_mailbox_maps = proxy:mysql:{config_dir}/mysql-virtual_mailboxes.cf
+virtual_mailbox_base = {vmail_mailbox_base}
+virtual_uid_maps = static:{vmail_userid}
+virtual_gid_maps = static:{vmail_groupid}
+smtpd_sasl_auth_enable = yes
+broken_sasl_auth_clients = yes
+smtpd_sasl_authenticated_header = yes
+smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf, reject_unauth_destination{rbl_list}
+smtpd_use_tls = yes
+smtpd_tls_security_level = may
+smtpd_tls_cert_file = {config_dir}/smtpd.cert
+smtpd_tls_key_file = {config_dir}/smtpd.key
+transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:{config_dir}/mysql-virtual_transports.cf
+relay_domains = mysql:{config_dir}/mysql-virtual_relaydomains.cf
+relay_recipient_maps = mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
+proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps
+smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf
+smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
+smtpd_client_message_rate_limit = 100
+maildrop_destination_concurrency_limit = 1
+maildrop_destination_recipient_limit   = 1
+virtual_transport = maildrop
+header_checks = regexp:{config_dir}/header_checks
+mime_header_checks = regexp:{config_dir}/mime_header_checks
+nested_header_checks = regexp:{config_dir}/nested_header_checks
+body_checks = regexp:{config_dir}/body_checks
+inet_interfaces = all
\ No newline at end of file
diff --git a/install/tpl/gentoo_postfix.conf.master b/install/tpl/gentoo_postfix.conf.master
new file mode 100644
index 0000000..c84bd11
--- /dev/null
+++ b/install/tpl/gentoo_postfix.conf.master
@@ -0,0 +1,30 @@
+virtual_alias_domains =
+virtual_alias_maps = proxy:mysql:{config_dir}/mysql-virtual_forwardings.cf, proxy:mysql:{config_dir}/mysql-virtual_email2email.cf
+virtual_mailbox_domains = proxy:mysql:{config_dir}/mysql-virtual_domains.cf
+virtual_mailbox_maps = proxy:mysql:{config_dir}/mysql-virtual_mailboxes.cf
+virtual_mailbox_base = {vmail_mailbox_base}
+virtual_uid_maps = static:{vmail_userid}
+virtual_gid_maps = static:{vmail_groupid}
+smtpd_sasl_auth_enable = yes
+broken_sasl_auth_clients = yes
+smtpd_sasl_authenticated_header = yes
+smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf, reject_unauth_destination{rbl_list}
+smtpd_use_tls = yes
+smtpd_tls_security_level = may
+smtpd_tls_cert_file = {config_dir}/smtpd.cert
+smtpd_tls_key_file = {config_dir}/smtpd.key
+transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:{config_dir}/mysql-virtual_transports.cf
+relay_domains = mysql:{config_dir}/mysql-virtual_relaydomains.cf
+relay_recipient_maps = mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
+proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps
+smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf
+smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
+smtpd_client_message_rate_limit = 100
+maildrop_destination_concurrency_limit = 1
+maildrop_destination_recipient_limit   = 1
+virtual_transport = maildrop
+header_checks = regexp:{config_dir}/header_checks
+mime_header_checks = regexp:{config_dir}/mime_header_checks
+nested_header_checks = regexp:{config_dir}/nested_header_checks
+body_checks = regexp:{config_dir}/body_checks
+inet_interfaces = all
\ No newline at end of file
diff --git a/install/tpl/opensuse_postfix.conf.master b/install/tpl/opensuse_postfix.conf.master
new file mode 100644
index 0000000..c84bd11
--- /dev/null
+++ b/install/tpl/opensuse_postfix.conf.master
@@ -0,0 +1,30 @@
+virtual_alias_domains =
+virtual_alias_maps = proxy:mysql:{config_dir}/mysql-virtual_forwardings.cf, proxy:mysql:{config_dir}/mysql-virtual_email2email.cf
+virtual_mailbox_domains = proxy:mysql:{config_dir}/mysql-virtual_domains.cf
+virtual_mailbox_maps = proxy:mysql:{config_dir}/mysql-virtual_mailboxes.cf
+virtual_mailbox_base = {vmail_mailbox_base}
+virtual_uid_maps = static:{vmail_userid}
+virtual_gid_maps = static:{vmail_groupid}
+smtpd_sasl_auth_enable = yes
+broken_sasl_auth_clients = yes
+smtpd_sasl_authenticated_header = yes
+smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf, reject_unauth_destination{rbl_list}
+smtpd_use_tls = yes
+smtpd_tls_security_level = may
+smtpd_tls_cert_file = {config_dir}/smtpd.cert
+smtpd_tls_key_file = {config_dir}/smtpd.key
+transport_maps = hash:/var/lib/mailman/data/transport-mailman, proxy:mysql:{config_dir}/mysql-virtual_transports.cf
+relay_domains = mysql:{config_dir}/mysql-virtual_relaydomains.cf
+relay_recipient_maps = mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
+proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $virtual_mailbox_limit_maps
+smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf
+smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
+smtpd_client_message_rate_limit = 100
+maildrop_destination_concurrency_limit = 1
+maildrop_destination_recipient_limit   = 1
+virtual_transport = maildrop
+header_checks = regexp:{config_dir}/header_checks
+mime_header_checks = regexp:{config_dir}/mime_header_checks
+nested_header_checks = regexp:{config_dir}/nested_header_checks
+body_checks = regexp:{config_dir}/body_checks
+inet_interfaces = all
\ No newline at end of file

--
Gitblit v1.9.1