From 5c960fb4a669bc7e388acbfe4bdebcd436fa45ea Mon Sep 17 00:00:00 2001 From: tbrehm Date: Mon, 4 Apr 2011 07:07:06 +0000 Subject: [PATCH] Removed virtual_ config options from postfix main.cf file as they are not neede in a ispconfig 3 setup. See also: FS#1582 - ISPConfig 3 postfix problem: mysql-virtual_mailbox_limit_maps.cf is missing --- install/dist/lib/fedora.lib.php | 6 ------ install/dist/lib/gentoo.lib.php | 6 ------ install/dist/lib/opensuse.lib.php | 6 ------ install/lib/installer_base.lib.php | 6 ------ 4 files changed, 24 deletions(-) diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index eec9af6cc..611f2aea2 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -105,12 +105,6 @@ class installer_dist extends installer_base { 'transport_maps = 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', - 'virtual_create_maildirsize = yes', - 'virtual_maildir_extended = yes', - 'virtual_mailbox_limit_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailbox_limit_maps.cf', - 'virtual_mailbox_limit_override = yes', - 'virtual_maildir_limit_message = "The user you are trying to reach is over quota."', - 'virtual_overquota_bounce = yes', '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', diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index e77720ef1..1bcaaabc1 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -101,12 +101,6 @@ class installer extends installer_base 'smtpd_tls_key_file = '.$config_dir.'/smtpd.key', 'transport_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf', 'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf', - 'virtual_create_maildirsize = yes', - 'virtual_maildir_extended = yes', - 'virtual_mailbox_limit_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailbox_limit_maps.cf', - 'virtual_mailbox_limit_override = yes', - 'virtual_maildir_limit_message = "The user you are trying to reach is over quota."', - 'virtual_overquota_bounce = yes', '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', diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index 56e59a430..6a0fdbb03 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -119,12 +119,6 @@ class installer_dist extends installer_base { 'transport_maps = 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', - 'virtual_create_maildirsize = yes', - 'virtual_maildir_extended = yes', - 'virtual_mailbox_limit_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailbox_limit_maps.cf', - 'virtual_mailbox_limit_override = yes', - 'virtual_maildir_limit_message = "The user you are trying to reach is over quota."', - 'virtual_overquota_bounce = yes', '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', diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index b4ab81ab1..3c76c606b 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -516,12 +516,6 @@ class installer_base { 'transport_maps = 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', - 'virtual_create_maildirsize = yes', - 'virtual_maildir_extended = yes', - 'virtual_mailbox_limit_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailbox_limit_maps.cf', - 'virtual_mailbox_limit_override = yes', - 'virtual_maildir_limit_message = "The user you are trying to reach is over quota."', - 'virtual_overquota_bounce = yes', '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', -- GitLab