Merge branch 'stable-3.0.5' into 'stable-3.0.5'

Marius Cramer

2014-05-05 c9d4ef4e593bde5a12d3eaa19b44ea5829866004

 Merge branch 'stable-3.0.5' into 'stable-3.0.5'

Fix Update errors

I closed my last merge-request, as the request included all the upstream commits. I recreated my fork to get a clean environment.

Changes i've done are listed in commit f9d95c0cc0c61d89007a7a8a3b1a104344547446

 install/autoupdate.php

@@ -198,8 +198,10 @@
    $inst->configure_postfix('dont-create-certs');

    //** Configure mailman
    swriteln('Configuring Mailman');
    $inst->configure_mailman('update');
    if($conf['mailman']['installed'] == true) {
        swriteln('Configuring Mailman');
        $inst->configure_mailman('update');
    }

    //* Configure Jailkit
    swriteln('Configuring Jailkit');

 install/dist/lib/fedora.lib.php

@@ -392,7 +392,6 @@
            'virtual_transport = dovecot',
            'smtpd_sasl_type = dovecot',
            'smtpd_sasl_path = private/auth',
            'receive_override_options = no_address_mappings'
        );

        // Make a backup copy of the main.cf file

 install/dist/lib/opensuse.lib.php

@@ -443,7 +443,6 @@
            'virtual_transport = dovecot',
            'smtpd_sasl_type = dovecot',
            'smtpd_sasl_path = private/auth',
            'receive_override_options = no_address_mappings'
        );

        // Make a backup copy of the main.cf file
@@ -501,7 +500,7 @@
        exec("chown root:root $config_dir/$configfile");
        
        // Dovecot shall ignore mounts in website directory
        exec("doveadm mount add '/srv/www/*' ignore");
        if(is_installed('doveadm')) exec("doveadm mount add '/srv/www/*' ignore > /dev/null 2> /dev/null");

    }


 install/install.php

@@ -191,7 +191,9 @@
    $inst->configure_postfix();

    //* Configure Mailman
    $inst->configure_mailman('install');
    if($conf['mailman']['installed'] == true) {
        $inst->configure_mailman('install');
    }

    //* Configure jailkit
    swriteln('Configuring Jailkit');

 install/update.php

@@ -262,8 +262,10 @@
        $inst->configure_postfix('dont-create-certs');

        //** Configure mailman
        swriteln('Configuring Mailman');
        $inst->configure_mailman('update');
        if($conf['mailman']['installed'] == true) {
            swriteln('Configuring Mailman');
            $inst->configure_mailman('update');
        }

        //* Configure Jailkit
        swriteln('Configuring Jailkit');