Commit acb2f91e authored by Florian Schaal's avatar Florian Schaal

selected service reconfiguration bug

parent b0f818ef
......@@ -321,9 +321,28 @@ if($reconfigure_services_answer == 'yes' || $reconfigure_services_answer == 'sel
if($conf['services']['mail']) {
//** Configure postfix
if($inst->reconfigure_app('Postfix', $reconfigure_services_answer)) {
if($inst->reconfigure_app('Postfix and IMAP/POP3', $reconfigure_services_answer)) {
swriteln('Configuring Postfix');
$inst->configure_postfix('dont-create-certs');
if($conf['dovecot']['installed'] == true) {
//* Configure dovecot
swriteln('Configuring Dovecot');
$inst->configure_dovecot();
} elseif ($conf['courier']['installed'] == true) {
//** Configure saslauthd
swriteln('Configuring SASL');
$inst->configure_saslauthd();
//** Configure PAM
swriteln('Configuring PAM');
$inst->configure_pam();
//* Configure courier
swriteln('Configuring Courier');
$inst->configure_courier();
}
}
//** Configure mailman
......@@ -332,24 +351,6 @@ if($reconfigure_services_answer == 'yes' || $reconfigure_services_answer == 'sel
$inst->configure_mailman('update');
}
if($conf['dovecot']['installed'] == true && $inst->reconfigure_app('Dovecot', $reconfigure_services_answer)) {
//* Configure dovecot
swriteln('Configuring Dovecot');
$inst->configure_dovecot();
} elseif ($conf['courier']['installed'] == true && $inst->reconfigure_app('Courier', $reconfigure_services_answer)) {
//** Configure saslauthd
swriteln('Configuring SASL');
$inst->configure_saslauthd();
//** Configure PAM
swriteln('Configuring PAM');
$inst->configure_pam();
//* Configure courier
swriteln('Configuring Courier');
$inst->configure_courier();
}
//** Configure Spamasassin
if($inst->reconfigure_app('Spamassassin', $reconfigure_services_answer)) {
swriteln('Configuring Spamassassin');
......
Markdown is supported
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