Skip to content

Commit bb4fc7f

Browse files
committed
check for centos8 dovecot file paths
1 parent 4fd6d02 commit bb4fc7f

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

install/dist/lib/debian60.lib.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function configure_dovecot()
3939
$configure_lmtp = false;
4040

4141
// use lmtp if installed
42-
if($configure_lmtp = is_file('/usr/lib/dovecot/lmtp')) {
42+
if($configure_lmtp = (is_file('/usr/lib/dovecot/lmtp') || is_file('/usr/libexec/dovecot/lmtp'))) {
4343
$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
4444
}
4545

@@ -168,7 +168,7 @@ public function configure_dovecot()
168168
}
169169

170170
//* dovecot-managesieved
171-
if(is_file('/usr/lib/dovecot/managesieve')) {
171+
if(is_file('/usr/lib/dovecot/managesieve') || is_file('/usr/libexec/dovecot/managesieve')) {
172172
$dovecot_protocols .= ' sieve';
173173
}
174174

install/dist/lib/fedora.lib.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,11 @@ public function configure_dovecot()
381381

382382
$configure_lmtp = false;
383383

384+
// use lmtp if installed
385+
if($configure_lmtp = (is_file('/usr/lib/dovecot/lmtp') || is_file('/usr/libexec/dovecot/lmtp'))) {
386+
$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
387+
}
388+
384389
// check if virtual_transport must be changed
385390
if ($this->is_update) {
386391
$tmp = $this->db->queryOneRecord("SELECT * FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . ".server", $conf['server_id']);

install/lib/installer_base.lib.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1418,7 +1418,7 @@ public function configure_dovecot() {
14181418
$configure_lmtp = false;
14191419

14201420
// use lmtp if installed
1421-
if($configure_lmtp = is_file('/usr/lib/dovecot/lmtp')) {
1421+
if($configure_lmtp = (is_file('/usr/lib/dovecot/lmtp') || is_file('/usr/libexec/dovecot/lmtp'))) {
14221422
$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
14231423
}
14241424

@@ -1577,7 +1577,7 @@ public function configure_dovecot() {
15771577
}
15781578

15791579
//* dovecot-managesieved
1580-
if(is_file('/usr/lib/dovecot/managesieve')) {
1580+
if(is_file('/usr/lib/dovecot/managesieve') || is_file('/usr/libexec/dovecot/managesieve')) {
15811581
$dovecot_protocols .= ' sieve';
15821582
}
15831583

server/plugins-available/postfix_server_plugin.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,15 +288,15 @@ function update($event_name, $data) {
288288
$dovecot_protocols = 'imap pop3';
289289

290290
//* dovecot-lmtpd
291-
if( ($configure_lmtp = is_file('/usr/lib/dovecot/lmtp')) ||
291+
if( ($configure_lmtp = (is_file('/usr/lib/dovecot/lmtp') || is_file('/usr/libexec/dovecot/lmtp'))) ||
292292
($mail_config["mailbox_virtual_uidgid_maps"] == 'y') )
293293
{
294294
$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
295295
$dovecot_protocols .= ' lmtp';
296296
}
297297

298298
//* dovecot-managesieved
299-
if(is_file('/usr/lib/dovecot/managesieve')) {
299+
if(is_file('/usr/lib/dovecot/managesieve') || is_file('/usr/libexec/dovecot/managesieve')) {
300300
$dovecot_protocols .= ' sieve';
301301
}
302302

0 commit comments

Comments
 (0)