fix docroot issue (bug #187113 - thanks throw_away_2002) - remove stale files

(Portage version: 2.1.2.12)

4 files changed, 4 insertions, 81 deletions

diff --git a/www-servers/mini_httpd/files/mini_httpd.conf.sample b/www-servers/mini_httpd/files/mini_httpd.conf.sample
deleted file mode 100644
index 092f7a546b48..000000000000
--- a/www-servers/mini_httpd/files/mini_httpd.conf.sample
+++ /dev/null
@@ -1,47 +0,0 @@
-## /etc/mini_httpd.conf
-##
-## do not leave empty lines in here!
-## format is: key=value
-##
-## run in debug-mode?
-#debug
-##
-## what interface to bind to?
-## (default is binding to any interface)
-#host=www.example.org
-port=8080
-user=nobody
-##
-## CGI:
-##	?	match a single char
-##	*	matches any string excluding "/"
-##	**	matches any string including "/"
-##	separate multiple patterns with "|"
-#cgipat=**.sh|**.cgi
-##
-## chroot:
-chroot
-#nochroot
-##
-logfile=/var/log/mini_httpd.log
-pidfile=/var/run/mini_httpd.pid
-##
-charset=iso-8859-1
-##
-## control the caching: (in secs)
-#maxage 60
-##
-## useless setting (just modifies the http-header)
-## (see mini_httpd(8) and http://www.w3.org/P3P/ for more info)
-#p3p
-##
-## virtual hosting:
-#vhost
-##
-## cache-control: send this "max-age" in all HTTP-responses:
-#max-age=0
-##
-## ssl:
-#nossl
-#ssl
-#certfile=/tmp/mini_httpd.pem
diff --git a/www-servers/mini_httpd/files/mini_httpd.confd b/www-servers/mini_httpd/files/mini_httpd.confd
deleted file mode 100644
index f570bc460830..000000000000
--- a/www-servers/mini_httpd/files/mini_httpd.confd
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/files/mini_httpd.confd,v 1.1 2004/08/08 17:37:46 stuart Exp $
-
-## Config file for /etc/init.d/mini_httpd
-
-## the startup-dir of mini_httpd is the docroot, so we specify it here
-## and the init-script does a "cd" prior to startup:
-#MINI_HTTPD_DOCROOT="/home/httpd/htdocs"
-
-## There are 2 ways to configure mini_httpd:
-##	1) specify all params on the cmd-line
-##	2) use a config-file (and start with "-C <conf-file>")
-## Note: 1) and 2) can be mixed.
-##
-## We choose 1) here -- if you have a more complicated setup read
-## mini_httpd(8) for details on 2).
-
-MINI_HTTPD_OPTS="-p 8080 -u nobody -r -i /var/run/mini_httpd.pid -l /var/log/mini_httpd.log"
-
-## to add cgi-support you should switch over to a config-file, a sample can
-## be found in your DOCDESTTREE (/usr/share/doc/mini_httpd-xxxx) named
-##     mini_httpd.conf.sample.gz
-## copy the sample to /etc/mini_httpd.conf and replace the MINI_HTTPD_OPTS-line
-## above by:
-##MINI_HTTPD_OPTS="-C /etc/mini_httpd.conf"
diff --git a/www-servers/mini_httpd/files/mini_httpd.confd-1.19 b/www-servers/mini_httpd/files/mini_httpd.confd-1.19
index 31312e2ea963..e310f669d9c0 100644
--- a/www-servers/mini_httpd/files/mini_httpd.confd-1.19
+++ b/www-servers/mini_httpd/files/mini_httpd.confd-1.19
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/files/mini_httpd.confd-1.19,v 1.1 2004/08/08 17:37:46 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/files/mini_httpd.confd-1.19,v 1.2 2007/08/26 21:20:21 bangert Exp $
 
 ## Config file for /etc/init.d/mini_httpd
 
 ## the startup-dir of mini_httpd is the docroot, so we specify it here
 ## and the init-script does a "cd" prior to startup:
-#MINI_HTTPD_DOCROOT="/var/www/localhost"
+MINI_HTTPD_DOCROOT="/var/www/localhost/htdocs"
 
 ## There are 2 ways to configure mini_httpd:
 ##	1) specify all params on the cmd-line
@@ -16,7 +16,7 @@
 ## We choose 1) here -- if you have a more complicated setup read
 ## mini_httpd(8) for details on 2).
 
-MINI_HTTPD_OPTS="-p 8080 -u nobody -r -i /var/run/mini_httpd.pid -l /var/log/mini_httpd.log"
+MINI_HTTPD_OPTS="-p 8080 -u nobody -r -i /var/run/mini_httpd.pid -l /var/log/mini_httpd.log -d ${MINI_HTTPD_DOCROOT}"
 
 ## to add cgi-support you should switch over to a config-file, a sample can
 ## be found in your DOCDESTTREE (/usr/share/doc/mini_httpd-xxxx) named
diff --git a/www-servers/mini_httpd/files/mini_httpd.init b/www-servers/mini_httpd/files/mini_httpd.init
index f32c883d024e..ccaf53d31fe8 100644
--- a/www-servers/mini_httpd/files/mini_httpd.init
+++ b/www-servers/mini_httpd/files/mini_httpd.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/files/mini_httpd.init,v 1.1 2004/08/08 17:37:46 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/mini_httpd/files/mini_httpd.init,v 1.2 2007/08/26 21:20:21 bangert Exp $
 
 depend() {
 	need net
@@ -13,10 +13,6 @@ start() {
 		eend 1 "MINI_HTTPD_DOCROOT not set correctly in /etc/conf.d/mini_httpd"
 		exit 1
 	fi
-	cd $MINI_HTTPD_DOCROOT
-	if [ $? -ne 0 ]; then
-		eend $? "ERROR: cannot change to docroot \"$MINI_HTTPD_DOCROOT\""
-	fi
 	start-stop-daemon --quiet --start --startas /usr/sbin/mini_httpd \
 		--pidfile /var/run/mini_httpd.pid -- ${MINI_HTTPD_OPTS}
 	eend $?