From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Tue, 16 Apr 2019 11:51:42 +0000 (+0200)
Subject: - rel 4; allow different location for exim.conf
X-Git-Tag: auto/th/exim-4.92-4
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fexim.git;a=commitdiff_plain;h=c28a5ac

- rel 4; allow different location for exim.conf
---

diff --git a/exim.init b/exim.init
index b7dd9ae..d684c12 100755
--- a/exim.init
+++ b/exim.init
@@ -17,6 +17,8 @@
 
 QUEUE=1h
 
+EXIM_CONFIG=/etc/mail/exim.conf
+
 # Source exim configureation.
 if [ -f /etc/sysconfig/exim ]; then
 	. /etc/sysconfig/exim
@@ -37,7 +39,7 @@ checkconfig() {
 
 	RETVAL=0
 	if [ $details = 1 ]; then
-		for CONFIG in /etc/mail/exim.conf $EXIM_EXTRA_CONFIGS; do
+		for CONFIG in "$EXIM_CONFIG" $EXIM_EXTRA_CONFIGS; do
 			run_cmd "Checking exim configuration ($CONFIG)" exim -bV -C $CONFIG
 			ret=$?
 			if [ $ret != 0 ]; then
@@ -45,8 +47,8 @@ checkconfig() {
 			fi
 		done
 	else
-		for CONFIG in /etc/mail/exim.conf $EXIM_EXTRA_CONFIGS; do
-			exim -bV -C $CONFIG > /dev/null 2>&1
+		for CONFIG in "$EXIM_CONFIG" $EXIM_EXTRA_CONFIGS; do
+			exim -bV -C "$CONFIG" > /dev/null 2>&1
 			ret=$?
 			if [ $ret != 0 ]; then
 				show "Checking %s configuration (%s)" "exim" "$CONFIG"; fail
@@ -71,7 +73,8 @@ start() {
 	daemon /usr/bin/exim \
 		-oP /var/spool/exim/exim-daemon.pid \
 		$( is_yes "$ALLOW_TCP_CONNECTIONS" && echo -bd ) \
-		$( [ -n "$QUEUE" ] && echo -q$QUEUE )
+		$( [ -n "$QUEUE" ] && echo -q$QUEUE ) \
+		-C "$EXIM_CONFIG"
 	for CONFIG in $EXIM_EXTRA_CONFIGS; do
 			msg_starting "Exim ($CONFIG)"
 			daemon exim \
diff --git a/exim.spec b/exim.spec
index cdba6b6..15d5bc4 100644
--- a/exim.spec
+++ b/exim.spec
@@ -25,7 +25,7 @@ Summary(pl.UTF-8):	Agent Transferu Poczty Uniwersytetu w Cambridge
 Summary(pt_BR.UTF-8):	Servidor de correio eletrônico exim
 Name:		exim
 Version:	4.92
-Release:	3
+Release:	4
 Epoch:		2
 License:	GPL
 Group:		Networking/Daemons/SMTP