[Lxr-commits] CVS: lxr/templates/lighttpd lighttpd-lxrserver.conf, 1.9, 1.10

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr/templates/lighttpd
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12992/templates/lighttpd

Modified Files:
	lighttpd-lxrserver.conf 
Log Message:
templates/lighttpd/lighttpd-lxrserver.conf: fix automatic configuration for standard cases

Macro expansion tuned for the "classic" cases handled by interactive configurator

Index: lighttpd-lxrserver.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lighttpd/lighttpd-lxrserver.conf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- lighttpd-lxrserver.conf	22 Jan 2013 09:15:53 -0000	1.9
+++ lighttpd-lxrserver.conf	22 Jan 2013 09:36:40 -0000	1.10
@@ -457,36 +457,38 @@
 ##
 #ssi.extension += ( ".html" )
 
+# The following directive may cause conflict when LXR server is merged
+# with an existing server. Then remove it and keep the one describing
+# the real site root.
 	server.document-root = "%LXRroot%/"
-#	$HTTP["host"] == "host_name" {
-#		server.document-root = "%LXRroot%/"
-#	}
 
-## ------- URL black magic for multiple trees ------
+	$HTTP["host"] == "%hostname%" {
+		server.document-root = "%LXRroot%/"
+	}
+# Add more for alias names
+
+## ------- URL black magic for multiple trees and sub-siting ------
 ##
 ## Format is "virtroot" => "%LXRroot%"
 ## for all 'virtroot' to be served by the same LXR server
 ## located in the root directory.
 #@IF	%_singlecontext%
 #	$HTTP["url"] =~ "^%virtrootbase%/[^/]+/" {
-#		alias.url +=	("%virtrootbase%/tree1/" => "%LXRroot%/")
-#		alias.url +=	("%virtrootbase%/tree2/" => "%LXRroot%/")
-#		alias.url +=	("%virtrootbase%/tree3/" => "%LXRroot%/")
+#		alias.url +=	("%virtrootbase%/tree/" => "%LXRroot%/")
 #	}
 # 
-#@ELSE
-	$HTTP["url"] =~ "^%virtrootbase%/[^/]+/" {
+#@ENDIF
+#@IF	'' ne "%virtrootbase%"
+	$HTTP["url"] =~ "^%virtrootbase%/" {
 #@ENDIF
 #- - -
 #- - - Note: block below is interpreted during pass 2.
 #- - -
 #@PASS2 here_virtroot
-#@	IF	!%_singlecontext%
 		alias.url +=	("%virtroot%/" => "%LXRroot%/")
-#@	ENDIF
 #@ENDP2
 #- - - End of second pass additions
-#@IF	!%_singlecontext%
+#@IF	'' ne "%virtrootbase%"
 	}
 #@ENDIF