Commit c9d4ef4e authored by Marius Cramer's avatar Marius Cramer
Browse files

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 f9d95c0c
parents 89629678 f9d95c0c
......@@ -198,8 +198,10 @@ if($conf['services']['mail'] == true) {
$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');
......
......@@ -392,7 +392,6 @@ class installer_dist extends installer_base {
'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
......
......@@ -443,7 +443,6 @@ class installer_dist extends installer_base {
'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 @@ class installer_dist extends installer_base {
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");
}
......
......@@ -191,7 +191,9 @@ if($install_mode == 'standard') {
$inst->configure_postfix();
//* Configure Mailman
$inst->configure_mailman('install');
if($conf['mailman']['installed'] == true) {
$inst->configure_mailman('install');
}
//* Configure jailkit
swriteln('Configuring Jailkit');
......
......@@ -262,8 +262,10 @@ if($reconfigure_services_answer == 'yes') {
$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');
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment