[Webapps-common-discuss] webapps-common/internal httpd,1.1,1.2

[seanius at haydn.debian.org]

Update of /cvsroot/webapps-common/webapps-common/internal
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv11323/internal

Modified Files:
	httpd 
Log Message:
initial support for the test-apache-simple version


Index: httpd
===================================================================
RCS file: /cvsroot/webapps-common/webapps-common/internal/httpd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- httpd	24 May 2005 02:36:47 -0000	1.1
+++ httpd	2 Aug 2005 23:57:47 -0000	1.2
@@ -1,7 +1,11 @@
 # httpd-related functions
 
 wc_httpd_apaches="apache apache-ssl apache-perl apache2"
-wc_httpd_supported="$wc_httpd_apaches"
+
+# if they have not specified what they support, assume support for all
+if [ ! "$wc_httpd_supported" ]; then
+	wc_httpd_supported="$wc_httpd_apaches"
+fi
 
 #
 # wc_httpd_installed: test for installed httpds
@@ -94,12 +98,12 @@
 	if [ "$*" ]; then
 		httpds=$*
 	else
-		httpds=`wc_httpd_installed $wc_httpd_apaches`
+		httpds=`wc_httpd_installed $wc_httpd_supported`
 	fi
 	for h in $httpds; do
 		confdir="/etc/$h/conf.d"
 		conflink="$confdir/${name}.conf"
-		if [ -d "$confdir" ]; then
+		if [ -d "$confdir" -a ! -e "$conflink" ]; then
 			ln -s "$incfile" "$conflink"
 		fi
 	done
@@ -131,7 +135,7 @@
 	if [ "$*" ]; then
 		httpds=$*
 	else
-		httpds=`wc_httpd_installed $wc_httpd_apaches`
+		httpds=`wc_httpd_installed $wc_httpd_supported`
 	fi
 	for h in $httpds; do
 		conflink="/etc/$h/conf.d/${name}.conf"