create command pipe at runtime

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

4 files changed, 22 insertions, 3 deletions

diff --git a/www-servers/ocsigenserver/ChangeLog b/www-servers/ocsigenserver/ChangeLog
index fa132f37711f..e0660d8ea040 100644
--- a/www-servers/ocsigenserver/ChangeLog
+++ b/www-servers/ocsigenserver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/ocsigenserver
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ChangeLog,v 1.10 2015/07/16 12:51:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ChangeLog,v 1.11 2015/07/16 13:10:33 aballier Exp $
+
+  16 Jul 2015; Alexis Ballier <aballier@gentoo.org>
+  ocsigenserver-2.5-r1.ebuild, files/ocsigenserver.confd,
+  files/ocsigenserver.initd:
+  create command pipe at runtime
 
 *ocsigenserver-2.5-r1 (16 Jul 2015)
 
diff --git a/www-servers/ocsigenserver/files/ocsigenserver.confd b/www-servers/ocsigenserver/files/ocsigenserver.confd
index 19de30cc93e3..70638b7c8709 100644
--- a/www-servers/ocsigenserver/files/ocsigenserver.confd
+++ b/www-servers/ocsigenserver/files/ocsigenserver.confd
@@ -20,3 +20,6 @@ PIDFILE=/var/run/$NAME.pid
 # Add here any additional aptions for ocsigen
 
 OCSIGEN_OPTS=""
+
+# Command pipe
+COMMANDPIPE=/var/run/ocsigenserver_command
diff --git a/www-servers/ocsigenserver/files/ocsigenserver.initd b/www-servers/ocsigenserver/files/ocsigenserver.initd
index 02edbd8fa603..accf4753e179 100644
--- a/www-servers/ocsigenserver/files/ocsigenserver.initd
+++ b/www-servers/ocsigenserver/files/ocsigenserver.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="depend checkconfig reload"
@@ -25,6 +25,11 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 
+	ebegin "Creating command pipe (${COMMANDPIPE})"
+	mkfifo -m 660 "${COMMANDPIPE}"
+	chown ocsigenserver:ocsigenserver "${COMMANDPIPE}"
+	eend $?
+
 	ebegin "Starting ocsigen"
 	start-stop-daemon --start --exec $DAEMON -- \
 			--pidfile $PIDFILE \
@@ -37,6 +42,9 @@ stop() {
 	ebegin "Stopping ocsigen"
 	start-stop-daemon --stop --pidfile $PIDFILE
 	eend $?
+	ebegin "Removing command pipe (${COMMANDPIPE})"
+	rm -f "${COMMANDPIPE}"
+	eend $?
 }
 
 reload() {
diff --git a/www-servers/ocsigenserver/ocsigenserver-2.5-r1.ebuild b/www-servers/ocsigenserver/ocsigenserver-2.5-r1.ebuild
index 09fa604fe0af..807d0981b9d1 100644
--- a/www-servers/ocsigenserver/ocsigenserver-2.5-r1.ebuild
+++ b/www-servers/ocsigenserver/ocsigenserver-2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ocsigenserver-2.5-r1.ebuild,v 1.1 2015/07/16 12:51:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ocsigenserver-2.5-r1.ebuild,v 1.2 2015/07/16 13:10:33 aballier Exp $
 
 EAPI=5
 
@@ -85,4 +85,7 @@ src_install() {
 	newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver || die
 
 	dodoc README
+
+	# We create it at runtime
+	rm -f "${ED}/var/run/ocsigenserver_command" || die
 }