care about bug 70943

Package-Manager: portage-2.0.51-r15

5 files changed, 118 insertions, 7 deletions

diff --git a/dev-dotnet/xsp/ChangeLog b/dev-dotnet/xsp/ChangeLog
index 7be5303767a0..76e47664a292 100644
--- a/dev-dotnet/xsp/ChangeLog
+++ b/dev-dotnet/xsp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-dotnet/xsp
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/ChangeLog,v 1.18 2005/02/09 03:01:39 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/ChangeLog,v 1.19 2005/02/17 05:30:33 trapni Exp $
+
+  17 Feb 2005; Christian Parpart <trapni@gentoo.org>
+  +files/mod-mono-server.confd, +files/mod-mono-server.initd:
+  adding mod-mono-server init.d/conf.d helper script for mod_mono; It is
+  questionable whether to add those right here or into mod_mono ebuild as the
+  server from dev-dotnet/xsp is started, but started for mod_mono as
+  mod-mono-server. however. See bug 70943.
 
 *xsp-1.0.5-r1 (08 Feb 2005)
 
diff --git a/dev-dotnet/xsp/Manifest b/dev-dotnet/xsp/Manifest
index 382191d45589..7cca0db82131 100644
--- a/dev-dotnet/xsp/Manifest
+++ b/dev-dotnet/xsp/Manifest
@@ -1,12 +1,14 @@
+MD5 2b81be2d1d452c62226d1b43913b883f ChangeLog 2657
+MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
+MD5 d980ee4b7c0d671fffbe3910c38defe5 xsp-1.0.2.ebuild 1055
 MD5 29461962bde01693f32e4b8b87224236 xsp-1.0.4.ebuild 1055
 MD5 cb75ceda1d874a8e7dcb01aca48a5d29 xsp-1.0.5.ebuild 1055
-MD5 821fc139ce066c7f061b9b5a2b1ff228 xsp-1.0.5-r1.ebuild 1224
-MD5 d980ee4b7c0d671fffbe3910c38defe5 xsp-1.0.2.ebuild 1055
-MD5 0615b4805d13c7bcba4428336421d756 ChangeLog 2279
-MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
+MD5 eb1acb06cbf076f27a1994dad4b754b5 xsp-1.0.5-r1.ebuild 1307
 MD5 478f71b966dfdb287739600f67a43200 files/digest-xsp-1.0.2 61
 MD5 1d50c87af657764f57be8292fbf95061 files/digest-xsp-1.0.4 61
 MD5 381f7e295bbcb9c85dab4f34f046174f files/digest-xsp-1.0.5 61
-MD5 381f7e295bbcb9c85dab4f34f046174f files/digest-xsp-1.0.5-r1 61
 MD5 5788140ef902e673f760b875b5f4c1c0 files/xsp.confd 301
 MD5 4c6ea487a7fa33ca219f4d49803f1e25 files/xsp.initd 669
+MD5 381f7e295bbcb9c85dab4f34f046174f files/digest-xsp-1.0.5-r1 61
+MD5 37f33b5c18732f3cac64ad248324b108 files/mod-mono-server.confd 1226
+MD5 450519001366538543908513012237be files/mod-mono-server.initd 1700
diff --git a/dev-dotnet/xsp/files/mod-mono-server.confd b/dev-dotnet/xsp/files/mod-mono-server.confd
new file mode 100644
index 000000000000..5542687aafe2
--- /dev/null
+++ b/dev-dotnet/xsp/files/mod-mono-server.confd
@@ -0,0 +1,30 @@
+# Config file for /etc/init.d/mod-mono-server
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/files/mod-mono-server.confd,v 1.1 2005/02/17 05:30:33 trapni Exp $
+
+# Configuration directives for mod-mono-server.exe. For more information on
+# these variables, see the man page for xsp(1).
+
+# This is the document root; trailing slash is not necessary
+#MonoServerRootDir="/usr/share/doc/xsp/test"
+
+# Directory to search for files with an `.webapp' extension.
+#MonoApplicationsConfigDir="/usr/share/doc/xsp/test"
+
+# Comma separated list of directories (in the form virtual:real) for all
+# applications managed by the server. For example:
+#   /app1:/var/www/localhost/htdocs/app1,/app2:/var/www/localhost/htdocs/app2
+MonoApplications="/mono:/usr/share/doc/xsp/test"
+
+# The communication channel used between mod-mono-server and mod_mono.
+#   unix - A unix socket
+#   tcp  - A TCP connection
+MonoServerChannel="unix"
+
+# When the comm. channel is "unix", the local filename used by the socket.
+UnixSocketFileName="/tmp/mod_mono_server"
+
+# When the comm. channel is "tcp", IP address for the server to listen on.
+#MonoServerAddress=127.0.0.1
+
+# When the comm. channel is "tcp", port for the server to listen on.
+#MonoServerPort=8080
diff --git a/dev-dotnet/xsp/files/mod-mono-server.initd b/dev-dotnet/xsp/files/mod-mono-server.initd
new file mode 100644
index 000000000000..5c475d5d459c
--- /dev/null
+++ b/dev-dotnet/xsp/files/mod-mono-server.initd
@@ -0,0 +1,70 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/files/mod-mono-server.initd,v 1.1 2005/02/17 05:30:33 trapni Exp $
+
+depend() {
+	use net
+	after dotnet
+}
+
+start() {
+	[ -z "$MonoServerRootDir" ] && \
+	MonoServerRootDir="/usr/share/doc/xsp/test"
+	[ -z "$MonoApplications" ] && \
+	MonoApplications="/mono:/usr/share/doc/xsp/test,/:."
+	[ -z "$UnixSocketFileName" ] && \
+	UnixSocketFileName="/tmp/mod_mono_server"
+	[ -z "$MonoServerAddress" ] && \
+	MonoServerAddress=127.0.0.1
+	[ -z "$MonoServerPort" ] && \
+	MonoServerPort=8080
+
+	MONO_SERVER_OPTS="--root ${MonoServerRootDir} \
+--applications ${MonoApplications} --nonstop"
+
+	[ -n "$MonoApplicationsConfigDir" ] && \
+	MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
+--appconfigdir ${MonoApplicationsConfigDir}"
+
+	case "$MonoServerChannel" in
+	"tcp" )
+		MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
+--address ${MonoServerAddress} --port ${MonoServerPort}"
+		;;
+	
+	"unix" )
+		[ -f "$UnixSocketFileName" ] && rm -f $UnixSocketFileName
+		MONO_SERVER_OPTS="${MONO_SERVER_OPTS} \
+--filename ${UnixSocketFileName}"
+		;;
+
+	* )
+		eerror "Please set a valid value for MonoServerChannel"
+		return 1
+		;;
+	esac
+
+	export MONO_SHARED_DIR=/tmp
+
+	ebegin "Starting mod-mono-server"
+
+	start-stop-daemon --quiet --start \
+		--background \
+		--make-pidfile \
+		--pidfile /var/run/aspnet/mod-mono-server.pid \
+		--chuid apache \
+		--exec /usr/bin/mono /usr/bin/mod-mono-server.exe \
+		-- $MONO_SERVER_OPTS
+
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping mod-mono-server"
+
+	start-stop-daemon -o --quiet --stop \
+		--pidfile /var/run/aspnet/mod-mono-server.pid
+
+	eend $?
+}
diff --git a/dev-dotnet/xsp/xsp-1.0.5-r1.ebuild b/dev-dotnet/xsp/xsp-1.0.5-r1.ebuild
index 624b79425ae2..1599b0aa5142 100644
--- a/dev-dotnet/xsp/xsp-1.0.5-r1.ebuild
+++ b/dev-dotnet/xsp/xsp-1.0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-1.0.5-r1.ebuild,v 1.1 2005/02/09 03:01:39 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/xsp/xsp-1.0.5-r1.ebuild,v 1.2 2005/02/17 05:30:33 trapni Exp $
 
 inherit mono eutils
 
@@ -42,7 +42,9 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 	exeinto /etc/init.d ; newexe ${FILESDIR}/xsp.initd xsp
+	newexe ${FILESDIR}/mod-mono-server.initd
 	insinto /etc/conf.d ; newins ${FILESDIR}/xsp.confd xsp
+	newins ${FILESDIR}/mod-mono-server.confd
 
 	keepdir /var/run/aspnet