testing/dbmail: fix initd and add default config

1 files changed, 9 insertions, 10 deletions

diff --git a/testing/dbmail/dbmail-imapd.initd b/testing/dbmail/dbmail-imapd.initd
index 8f6984feb06..cd8ed89cd1a 100644
--- a/testing/dbmail/dbmail-imapd.initd
+++ b/testing/dbmail/dbmail-imapd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 #
 
-PIDFILE="/var/run/dbmail-imapd.pid"
+PIDFILE="/var/run/dbmail/imapd.pid"
 
 depend() {
 	need net
@@ -11,23 +11,22 @@ depend() {
 }
 
 checkconfig() {
-	if [ ! -e "/etc/dbmail/dbmail.conf" ]; then
-		eerror "You need to create apropriate config"
-		eerror "in /etc/dbmail/ . Example can be found in /etc/dbmail/dbmail.conf.dist"
-		return 1
-	fi
-	# Avoid using root's TMPDIR
-	unset TMPDIR
+        if [ ! -e "/etc/dbmail.conf" ]; then
+                eerror "You need to create apropriate config"
+                eerror "/etc/dbmail.conf"
+                return 1
+        fi
+        # Avoid using root's TMPDIR
+        unset TMPDIR
 }
 
-
 start() {
 	checkconfig && \
 	ebegin "Starting DBMail IMAP daemon"
 	    start-stop-daemon --start --quiet \
 		--exec /usr/sbin/dbmail-imapd \
 		--name dbmail-imapd \
-		-- -p ${PIDFILE} -f /etc/dbmail/dbmail.conf 2>&1
+		-- -p ${PIDFILE} -f /etc/dbmail.conf 2>&1
 	eend $?
 }