Fix typos in init.d/conf.d and cronjob files.

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0x1E0CA85F!)

6 files changed, 27 insertions, 10 deletions

diff --git a/dev-python/mwlib/ChangeLog b/dev-python/mwlib/ChangeLog
index 459bdd96d79d..19fb0b8acf86 100644
--- a/dev-python/mwlib/ChangeLog
+++ b/dev-python/mwlib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/mwlib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/ChangeLog,v 1.26 2013/07/01 13:56:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/ChangeLog,v 1.27 2013/07/03 12:06:14 dev-zero Exp $
+
+*mwlib-0.15.8-r3 (03 Jul 2013)
+
+  03 Jul 2013; Tiziano Müller <dev-zero@gentoo.org>
+  +files/mwlib-purge-cache.cron-r1, +files/nslave.confd-r1,
+  +files/nslave.initd-r1, +files/postman.initd-r1, +mwlib-0.15.8-r3.ebuild,
+  -files/mwlib-purge-cache.cron, -files/nslave.confd, -files/nslave.initd,
+  -files/postman.initd, -mwlib-0.15.8-r2.ebuild:
+  Fix typos in init.d/conf.d and cronjob files.
 
 *mwlib-0.15.8-r2 (01 Jul 2013)
 
diff --git a/dev-python/mwlib/files/mwlib-purge-cache.cron b/dev-python/mwlib/files/mwlib-purge-cache.cron-r1
index d5a97ca61ce6..870beecad232 100644
--- a/dev-python/mwlib/files/mwlib-purge-cache.cron
+++ b/dev-python/mwlib/files/mwlib-purge-cache.cron-r1
@@ -1,4 +1,4 @@
 # purge mw-serve cache directory 
 # --cache-dir=DIR: the NSLAVE_CACHEDIR directory specified in /etc/conf.d/nslave
 # --purge-cache=HOURS: remove cache files that have not been touched for at east HOURS hours
-00 23 * * *  sudo -u mwlib mw-serve-ctl --cache-dir=/var/cache/mw-serve --purge-cache=24
+00 23 * * *  sudo -u mwlib mw-serve-ctl --cache-dir=/var/cache/mwlib --purge-cache=24
diff --git a/dev-python/mwlib/files/nslave.confd b/dev-python/mwlib/files/nslave.confd-r1
index 512be0fe1050..ccf758498163 100644
--- a/dev-python/mwlib/files/nslave.confd
+++ b/dev-python/mwlib/files/nslave.confd-r1
@@ -5,7 +5,7 @@ NSLAVE_ADDRESS="localhost"
 NSLAVE_PORT=8898
 
 # The url to serve the rendered files to the wiki
-NSLAVE_URL="http://${NSLAVE_ADDRESS}:${NSLAVE_PORT}"
+NSLAVE_URL="http://${NSLAVE_ADDRESS}:${NSLAVE_PORT}/cache"
 
 # The directory to save the rendered PDFs to
 NSLAVE_CACHEDIR="/var/cache/mwlib/"
diff --git a/dev-python/mwlib/files/nslave.initd b/dev-python/mwlib/files/nslave.initd-r1
index 8683c8d23ccd..980bce554322 100644
--- a/dev-python/mwlib/files/nslave.initd
+++ b/dev-python/mwlib/files/nslave.initd-r1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/files/nslave.initd,v 1.1 2013/07/01 13:56:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/files/nslave.initd-r1,v 1.1 2013/07/03 12:06:14 dev-zero Exp $
 
 description="nslave pulls new jobs from a mw-qserve instance"
 
@@ -17,7 +17,7 @@ command_background="yes"
 
 start_stop_daemon_args="--user ${NSLAVE_USER:-mwlib} \
 	--group ${NSLAVE_GROUP:-mwlib} \
-	${NSLAVE_LOGFILE-:+-stderr ${NSLAVE_LOGFILE}} \
+	${NSLAVE_LOGFILE:+--stderr ${NSLAVE_LOGFILE}} \
 	${NSLAVE_LOGFILE:+--stdout ${NSLAVE_LOGFILE}} \
 	--umask ${NSLAVE_UMASK}"
 
diff --git a/dev-python/mwlib/files/postman.initd b/dev-python/mwlib/files/postman.initd-r1
index ef890c304713..d248b6b76c3c 100644
--- a/dev-python/mwlib/files/postman.initd
+++ b/dev-python/mwlib/files/postman.initd-r1
@@ -1,12 +1,12 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/files/postman.initd,v 1.1 2013/07/01 13:56:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/files/postman.initd-r1,v 1.1 2013/07/03 12:06:14 dev-zero Exp $
 
 description="postman uploads zip collections to pediapress in case someone likes to order printed books"
 
 command="/usr/bin/postman"
-command_args="--cachedir=${POSTMAN_CACHDIR}"
+command_args="--cachedir=${POSTMAN_CACHEDIR}"
 
 pidfile="/var/run/${SVCNAME}.pid"
 command_background="yes"
diff --git a/dev-python/mwlib/mwlib-0.15.8-r2.ebuild b/dev-python/mwlib/mwlib-0.15.8-r3.ebuild
index 801e04f07b43..54e8c6cf5650 100644
--- a/dev-python/mwlib/mwlib-0.15.8-r2.ebuild
+++ b/dev-python/mwlib/mwlib-0.15.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/mwlib-0.15.8-r2.ebuild,v 1.1 2013/07/01 13:56:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mwlib/mwlib-0.15.8-r3.ebuild,v 1.1 2013/07/03 12:06:14 dev-zero Exp $
 
 EAPI=5
 
@@ -98,14 +98,22 @@ python_install_all() {
 		fperms 0750 /var/log/mwlib /var/cache/mwlib
 
 		insinto /etc/logrotate.d
-		for d in mw-qserve nserve nslave postman ; do
+		for d in mw-qserve nserve ; do
 			newins "${FILESDIR}/${d}.logrotate" "${d}"
 			newinitd "${FILESDIR}/${d}.initd" "${d}"
 			newconfd "${FILESDIR}/${d}.confd" "${d}"
 		done
 
+		newins "${FILESDIR}/nslave.logrotate" "nslave"
+		newinitd "${FILESDIR}/nslave.initd-r1" "nslave"
+		newconfd "${FILESDIR}/nslave.confd-r1" "nslave"
+
+		newins "${FILESDIR}/postman.logrotate" "postman"
+		newinitd "${FILESDIR}/postman.initd-r1" "postman"
+		newconfd "${FILESDIR}/postman.confd" "postman"
+
 		insinto /etc/cron.d
-		newins "${FILESDIR}/mwlib-purge-cache.cron" "mwlib-purge-cache"
+		newins "${FILESDIR}/mwlib-purge-cache.cron-r1" "mwlib-purge-cache"
 	else
 		rm "${D}"/usr/bin/{mw-qserve,nserve,nslave,postman}* || die "removing binaries failed"
 	fi