Dominik Müller
2014-10-13 a8aad2c0ffaec8be21d187848f03cc5519b17fd6
And additional in dist-files
4 files modified
60 ■■■■■ changed files
install/dist/lib/debian60.lib.php 15 ●●●●● patch | view | raw | blame | history
install/dist/lib/fedora.lib.php 15 ●●●●● patch | view | raw | blame | history
install/dist/lib/gentoo.lib.php 15 ●●●●● patch | view | raw | blame | history
install/dist/lib/opensuse.lib.php 15 ●●●●● patch | view | raw | blame | history
install/dist/lib/debian60.lib.php
@@ -33,6 +33,19 @@
    public function configure_dovecot()
    {
        global $conf;
        $virtual_transport = 'dovecot';
        // check if virtual_transport must be changed
        if ($this->is_update) {
            $tmp = $inst->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
            $ini_array = ini_to_array(stripslashes($tmp['config']));
            // ini_array needs not to be checked, because already done in update.php -> updateDbAndIni()
            if(isset($ini_array['mail']['mailbox_virtual_uidgid_maps']) && $ini_array['mail']['mailbox_virtual_uidgid_maps'] == 'y') {
                $virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
            }
        }
        $config_dir = $conf['dovecot']['config_dir'];
@@ -57,7 +70,7 @@
        // Adding the amavisd commands to the postfix configuration
        $postconf_commands = array (
            'dovecot_destination_recipient_limit = 1',
            'virtual_transport = dovecot',
            'virtual_transport = '.$virtual_transport,
            'smtpd_sasl_type = dovecot',
            'smtpd_sasl_path = private/auth'
        );
install/dist/lib/fedora.lib.php
@@ -376,6 +376,19 @@
    {
        global $conf;
        $virtual_transport = 'dovecot';
        // check if virtual_transport must be changed
        if ($this->is_update) {
            $tmp = $inst->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
            $ini_array = ini_to_array(stripslashes($tmp['config']));
            // ini_array needs not to be checked, because already done in update.php -> updateDbAndIni()
            if(isset($ini_array['mail']['mailbox_virtual_uidgid_maps']) && $ini_array['mail']['mailbox_virtual_uidgid_maps'] == 'y') {
                $virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
            }
        }
        $config_dir = $conf['dovecot']['config_dir'];
        //* Use /etc/dovecot as config dir if exists
@@ -402,7 +415,7 @@
        // Adding the amavisd commands to the postfix configuration
        $postconf_commands = array (
            'dovecot_destination_recipient_limit = 1',
            'virtual_transport = dovecot',
            'virtual_transport = '.$virtual_transport,
            'smtpd_sasl_type = dovecot',
            'smtpd_sasl_path = private/auth',
        );
install/dist/lib/gentoo.lib.php
@@ -220,6 +220,19 @@
    {
        global $conf;
        $virtual_transport = 'dovecot';
        // check if virtual_transport must be changed
        if ($this->is_update) {
            $tmp = $inst->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
            $ini_array = ini_to_array(stripslashes($tmp['config']));
            // ini_array needs not to be checked, because already done in update.php -> updateDbAndIni()
            if(isset($ini_array['mail']['mailbox_virtual_uidgid_maps']) && $ini_array['mail']['mailbox_virtual_uidgid_maps'] == 'y') {
                $virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
            }
        }
        $config_dir = $conf['dovecot']['config_dir'];
        $configfile = $conf['postfix']['config_dir'].'/master.cf';
@@ -245,7 +258,7 @@
        //* Reconfigure postfix to use dovecot authentication
        $postconf_commands = array (
            'dovecot_destination_recipient_limit = 1',
            'virtual_transport = dovecot',
            'virtual_transport = '.$virtual_transport,
            'smtpd_sasl_type = dovecot',
            'smtpd_sasl_path = private/auth'
        );
install/dist/lib/opensuse.lib.php
@@ -430,6 +430,19 @@
    {
        global $conf;
        $virtual_transport = 'dovecot';
        // check if virtual_transport must be changed
        if ($this->is_update) {
            $tmp = $inst->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
            $ini_array = ini_to_array(stripslashes($tmp['config']));
            // ini_array needs not to be checked, because already done in update.php -> updateDbAndIni()
            if(isset($ini_array['mail']['mailbox_virtual_uidgid_maps']) && $ini_array['mail']['mailbox_virtual_uidgid_maps'] == 'y') {
                $virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
            }
        }
        $config_dir = $conf['dovecot']['config_dir'];
        //* Configure master.cf and add a line for deliver
@@ -453,7 +466,7 @@
        // Adding the amavisd commands to the postfix configuration
        $postconf_commands = array (
            'dovecot_destination_recipient_limit = 1',
            'virtual_transport = dovecot',
            'virtual_transport = '.$virtual_transport,
            'smtpd_sasl_type = dovecot',
            'smtpd_sasl_path = private/auth',
        );