SPECS: qmail.spec - /var/qmail -> /var/lib/qmail - prepared to san...

[qboosh]

Author: qboosh                       Date: Sat Dec  1 16:15:36 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- /var/qmail -> /var/lib/qmail
- prepared to sanitize /service

---- Files affected:
SPECS:
   qmail.spec (1.174 -> 1.175) 

---- Diffs:

================================================================
Index: SPECS/qmail.spec
diff -u SPECS/qmail.spec:1.174 SPECS/qmail.spec:1.175
--- SPECS/qmail.spec:1.174	Fri Nov 30 20:22:27 2007
+++ SPECS/qmail.spec	Sat Dec  1 17:15:31 2007
@@ -260,8 +260,9 @@
 %define 	tcprules 	/etc/tcprules.d
 %define		supervise	%{_sysconfdir}/supervise
 
-# not FHS compliant
-%define		varqmail	/var/qmail
+%define		varqmail	/var/lib/qmail
+# not FHS compliant - use freedt with sane path?
+%define		servicedir	/service
 
 %description
 qmail is a small, fast, secure replacement for the SENDMAIL package,
@@ -747,17 +748,17 @@
 done
 
 echo "The QMTP and QMQP protocols are available, and can be started as:"
-echo "ln -s %{supervise}/qmtpd /service/qmail-qmtpd"
-echo "ln -s %{supervise}/qmqpd /service/qmail-qmqpd"
+echo "ln -s %{supervise}/qmtpd %{servicedir}/qmail-qmtpd"
+echo "ln -s %{supervise}/qmqpd %{servicedir}/qmail-qmqpd"
 echo
 
 # reload qmail-send on upgrade, the others are invoked anyway per connection
-if [ -d /service/qmail-send/supervise ]; then
-	svc -t /service/qmail-send /service/qmail-send/log
+if [ -d %{servicedir}/qmail-send/supervise ]; then
+	svc -t %{servicedir}/qmail-send %{servicedir}/qmail-send/log
 fi
 
-ln -snf %{supervise}/send /service/qmail-send
-ln -snf %{supervise}/smtpd /service/qmail-smtpd
+ln -snf %{supervise}/send %{servicedir}/qmail-send
+ln -snf %{supervise}/smtpd %{servicedir}/qmail-smtpd
 
 %if %{with tls}
 # session cert
@@ -819,9 +820,9 @@
 	# remove form supervise
 	# http://cr.yp.to/daemontools/faq/create.html#remove
 	for i in send smtpd qmtpd qmqpd; do
-		[ -d /service/qmail-$i/supervise ] || continue
-		cd /service/qmail-$i
-		rm /service/qmail-$i
+		[ -d %{servicedir}/qmail-$i/supervise ] || continue
+		cd %{servicedir}/qmail-$i
+		rm %{servicedir}/qmail-$i
 		svc -dx . log
 	done
 fi
@@ -835,15 +836,15 @@
 fi
 
 # add to supervise
-ln -snf %{supervise}/pop3d /service/qmail-pop3d
+ln -snf %{supervise}/pop3d %{servicedir}/qmail-pop3d
 
 %preun pop3
 # If package is being erased for the last time.
 if [ "$1" = "0" ]; then
 	# remove form supervise
-	if [ -d /service/qmail-pop3d/supervise ]; then
-		cd /service/qmail-pop3d
-		rm /service/qmail-pop3d
+	if [ -d %{servicedir}/qmail-pop3d/supervise ]; then
+		cd %{servicedir}/qmail-pop3d
+		rm %{servicedir}/qmail-pop3d
 		svc -dx . log
 	fi
 fi
@@ -1180,6 +1181,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.175  2007-12-01 16:15:31  qboosh
+- /var/qmail -> /var/lib/qmail
+- prepared to sanitize /service
+
 Revision 1.174  2007-11-30 19:22:27  adamg
 - it's public domain from now on
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qmail.spec?r1=1.174&r2=1.175&f=u