From 43950d8b7eb2d3b5bab0e67dfbaa3fbadda16872 Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Tue, 8 Jul 2014 11:09:25 -0400
Subject: [PATCH 1/2] BF: fix path to the exim log on Debian systems
 (/var/log/exim4)

---
 config/jail.conf         | 4 ++--
 config/paths-common.conf | 1 +
 config/paths-debian.conf | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/jail.conf b/config/jail.conf
index c42952d8..0aaed995 100644
--- a/config/jail.conf
+++ b/config/jail.conf
@@ -501,13 +501,13 @@ logpath = %(solidpop3d_log)s
 [exim]
 
 port   = smtp,465,submission
-logpath = /var/log/exim/mainlog
+logpath = %(exim_main_log)s
 
 
 [exim-spam]
 
 port   = smtp,465,submission
-logpath = /var/log/exim/mainlog
+logpath = %(exim_main_log)s
 
 
 [kerio]
diff --git a/config/paths-common.conf b/config/paths-common.conf
index 008dab4e..a2c9f7af 100644
--- a/config/paths-common.conf
+++ b/config/paths-common.conf
@@ -22,6 +22,7 @@ syslog_user =
 # from /etc/audit/auditd.conf
 auditd_log = /var/log/audit/audit.log
 
+exim_main_log = /var/log/exim/mainlog
 
 nginx_error_log = /var/log/nginx/error.log
 
diff --git a/config/paths-debian.conf b/config/paths-debian.conf
index 50ff948b..eff4fdae 100644
--- a/config/paths-debian.conf
+++ b/config/paths-debian.conf
@@ -30,6 +30,7 @@ apache_error_log = /var/log/apache2/*error.log
 
 apache_access_log = /var/log/apache2/*access.log
 
+exim_main_log = /var/log/exim4/mainlog
 
 # was in debian squeezy but not in wheezy
 # /etc/proftpd/proftpd.conf (SystemLog)

From 6cddc65ceeba8d5fe40ed367e5e650c60bc721b1 Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Mon, 14 Jul 2014 12:15:07 -0400
Subject: [PATCH 2/2] BF: path to exim's mainlog on Fedora (Thanks Frantisek
 Sumsal) + changelog entry

---
 ChangeLog                | 1 +
 config/paths-fedora.conf | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index bdae885c..0309b828 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,7 @@ ver. 0.9.1 (2014/xx/xx) - better, faster, stronger
      Thanks Serg G. Brester
    * Correct times for non-timezone date times formats during DST
    * Pass a copy of, not original, aInfo into actions to avoid side-effects
+   * Per-distribution paths to the exim's main log
 
 - New features:
    - Added monit filter thanks Jason H Martin.
diff --git a/config/paths-fedora.conf b/config/paths-fedora.conf
index 69322e43..cc574b39 100644
--- a/config/paths-fedora.conf
+++ b/config/paths-fedora.conf
@@ -32,4 +32,6 @@ apache_access_log = /var/log/httpd/*access_log
 # proftpd_log = /var/log/proftpd/auth.log
 # Tested and it worked out in /var/log/messages so assuming syslog_ftp for now.
 
+exim_main_log = /var/log/exim/main.log
+
 mysql_log = /var/lib/mysql/mysqld.log