Skip to content

Commit f9d95c0

Browse files
committed
during update from 3.0.5.3 to 3.0.5.4 on centos6 i got some error output
* i don't have mailman installed, but update.php tried to configure it * i also fixed the check for doveadm in suse & fedora lib, but it seems my centos dovecot does not have "doveadm mount" subcommand, so i think the doveadm error will still exist * on centos the 'receive_override_options = no_address_mappings' was added to postfix main.cf which leads to not working e-mail aliases/forwards Reconfigure Services? (yes,no) [yes]: /ispconfig/ispconfig3/tree/master/ Configuring Postfix postalias: fatal: open /var/lib/mailman/data/aliases: No such file or directory Configuring Mailman PHP Warning: chgrp(): Unable to find gid for mailman in /usr/src/ispconfig3_install/install/dist/lib/fedora.lib.php on line 106 Configuring Jailkit Configuring Dovecot usage: doveadm [-Dv] [-f ] [] altmove [-u |-A] [-S ] auth [-a ] [-x ] [] config [doveconf parameters] director add|flush|map|remove|status dump [-t ] expunge [-u |-A] [-S ] fetch [-u |-A] [-S ] force-resync [-u |-A] [-S ] help import [-u |-A] [-S ] kick [-a ] [-f] [|] log find|reopen|test mailbox create|delete|list|mutf7|rename|status|subscribe|unsubscribe penalty [-a ] [] purge [-u |-A] [-S ] pw [-l] [-p plaintext] [-r rounds] [-s scheme] [-u user] [-V] reload search [-u |-A] [-S ] sis deduplicate|find stop user [-a ] [-x ] [...] who [-a ] [-1] [] [] Configuring Spamassassin Configuring Getmail Configuring Database
1 parent 8962967 commit f9d95c0

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

install/autoupdate.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,10 @@
198198
$inst->configure_postfix('dont-create-certs');
199199

200200
//** Configure mailman
201-
swriteln('Configuring Mailman');
202-
$inst->configure_mailman('update');
201+
if($conf['mailman']['installed'] == true) {
202+
swriteln('Configuring Mailman');
203+
$inst->configure_mailman('update');
204+
}
203205

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

install/dist/lib/fedora.lib.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,6 @@ public function configure_dovecot()
392392
'virtual_transport = dovecot',
393393
'smtpd_sasl_type = dovecot',
394394
'smtpd_sasl_path = private/auth',
395-
'receive_override_options = no_address_mappings'
396395
);
397396

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

install/dist/lib/opensuse.lib.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,6 @@ public function configure_dovecot()
443443
'virtual_transport = dovecot',
444444
'smtpd_sasl_type = dovecot',
445445
'smtpd_sasl_path = private/auth',
446-
'receive_override_options = no_address_mappings'
447446
);
448447

449448
// Make a backup copy of the main.cf file
@@ -501,7 +500,7 @@ public function configure_dovecot()
501500
exec("chown root:root $config_dir/$configfile");
502501

503502
// Dovecot shall ignore mounts in website directory
504-
exec("doveadm mount add '/srv/www/*' ignore");
503+
if(is_installed('doveadm')) exec("doveadm mount add '/srv/www/*' ignore > /dev/null 2> /dev/null");
505504

506505
}
507506

install/install.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,9 @@
191191
$inst->configure_postfix();
192192

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

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

install/update.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,10 @@
262262
$inst->configure_postfix('dont-create-certs');
263263

264264
//** Configure mailman
265-
swriteln('Configuring Mailman');
266-
$inst->configure_mailman('update');
265+
if($conf['mailman']['installed'] == true) {
266+
swriteln('Configuring Mailman');
267+
$inst->configure_mailman('update');
268+
}
267269

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

0 commit comments

Comments
 (0)