From bb4fc7f7589ed13f91f3a599aa462b87fc5456bc Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Thu, 8 Oct 2020 17:54:52 -0600
Subject: [PATCH] check for centos8 dovecot file paths
---
install/dist/lib/debian60.lib.php | 4 ++--
install/dist/lib/fedora.lib.php | 5 +++++
install/lib/installer_base.lib.php | 4 ++--
server/plugins-available/postfix_server_plugin.inc.php | 4 ++--
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
index a8e90f189b..154c6b99c4 100644
--- a/install/dist/lib/debian60.lib.php
+++ b/install/dist/lib/debian60.lib.php
@@ -39,7 +39,7 @@ class installer extends installer_base {
$configure_lmtp = false;
// use lmtp if installed
- if($configure_lmtp = is_file('/usr/lib/dovecot/lmtp')) {
+ if($configure_lmtp = (is_file('/usr/lib/dovecot/lmtp') || is_file('/usr/libexec/dovecot/lmtp'))) {
$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
}
@@ -168,7 +168,7 @@ class installer extends installer_base {
}
//* dovecot-managesieved
- if(is_file('/usr/lib/dovecot/managesieve')) {
+ if(is_file('/usr/lib/dovecot/managesieve') || is_file('/usr/libexec/dovecot/managesieve')) {
$dovecot_protocols .= ' sieve';
}
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 2d31b89bbd..095e99eeae 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -381,6 +381,11 @@ class installer_dist extends installer_base {
$configure_lmtp = false;
+ // use lmtp if installed
+ if($configure_lmtp = (is_file('/usr/lib/dovecot/lmtp') || is_file('/usr/libexec/dovecot/lmtp'))) {
+ $virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
+ }
+
// check if virtual_transport must be changed
if ($this->is_update) {
$tmp = $this->db->queryOneRecord("SELECT * FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . ".server", $conf['server_id']);
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index c82fd16537..f36997c877 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1418,7 +1418,7 @@ class installer_base {
$configure_lmtp = false;
// use lmtp if installed
- if($configure_lmtp = is_file('/usr/lib/dovecot/lmtp')) {
+ if($configure_lmtp = (is_file('/usr/lib/dovecot/lmtp') || is_file('/usr/libexec/dovecot/lmtp'))) {
$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
}
@@ -1577,7 +1577,7 @@ class installer_base {
}
//* dovecot-managesieved
- if(is_file('/usr/lib/dovecot/managesieve')) {
+ if(is_file('/usr/lib/dovecot/managesieve') || is_file('/usr/libexec/dovecot/managesieve')) {
$dovecot_protocols .= ' sieve';
}
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
index cf73cf93e7..21a6a404ea 100644
--- a/server/plugins-available/postfix_server_plugin.inc.php
+++ b/server/plugins-available/postfix_server_plugin.inc.php
@@ -288,7 +288,7 @@ class postfix_server_plugin {
$dovecot_protocols = 'imap pop3';
//* dovecot-lmtpd
- if( ($configure_lmtp = is_file('/usr/lib/dovecot/lmtp')) ||
+ if( ($configure_lmtp = (is_file('/usr/lib/dovecot/lmtp') || is_file('/usr/libexec/dovecot/lmtp'))) ||
($mail_config["mailbox_virtual_uidgid_maps"] == 'y') )
{
$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
@@ -296,7 +296,7 @@ class postfix_server_plugin {
}
//* dovecot-managesieved
- if(is_file('/usr/lib/dovecot/managesieve')) {
+ if(is_file('/usr/lib/dovecot/managesieve') || is_file('/usr/libexec/dovecot/managesieve')) {
$dovecot_protocols .= ' sieve';
}
--
GitLab