[Lxr-commits] CVS: lxr/templates/lighttpd lighttpd-lxrserver.conf, 1.6, 1.7

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

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

Modified Files:
	lighttpd-lxrserver.conf 
Log Message:
In scripts configure-lxr.pl, ContextMgr.pm, LCLInterpreter.pm, recreatedb.pm
Some templates

Modifications to configurator to manage web server setup, changes to LCL to better handle configuration variants; all of these imply adaptations and additions to Apache, lighttpd templates and lxr.conf (& associated parts).

Index: lighttpd-lxrserver.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lighttpd/lighttpd-lxrserver.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- lighttpd-lxrserver.conf	19 Jan 2013 13:59:42 -0000	1.6
+++ lighttpd-lxrserver.conf	21 Jan 2013 10:49:36 -0000	1.7
@@ -92,7 +92,7 @@
 ##  Basic Configuration
 ## ---------------------
 ##
-# server.port = 80
+server.port = %port%
 
 ##
 ## Use IPv6?
@@ -468,21 +468,21 @@
 ## for all 'virtroot' to be served by the same LXR server
 ## located in the root directory.
 #@IF	%_singlecontext%
-#	$HTTP["url"] !~ "^/lxr/[^/]+/" {
-#		alias.url +=	("/lxr/tree1/" => "%LXRroot%/")
-#		alias.url +=	("/lxr/tree2/" => "%LXRroot%/")
-#		alias.url +=	("/lxr/tree3/" => "%LXRroot%/")
+#	$HTTP["url"] !~ "^%virtrootbase%/[^/]+/" {
+#		alias.url +=	("%virtrootbase%/tree1/" => "%LXRroot%/")
+#		alias.url +=	("%virtrootbase%/tree2/" => "%LXRroot%/")
+#		alias.url +=	("%virtrootbase%/tree3/" => "%LXRroot%/")
 #	}
 # 
 #@ELSE
-	$HTTP["url"] =~ "^/lxr/[^/]+/" {
+	$HTTP["url"] =~ "^%virtrootbase%/[^/]+/" {
 #@ENDIF
 #- - -
 #- - - Note: block below is interpreted during pass 2.
 #- - -
 #@PASS2 here_virtroot
 #@	IF	!%_singlecontext%
-#@U		alias.url +=	("%virtroot%/" => "%LXRroot%/")
+		alias.url +=	("%virtroot%/" => "%LXRroot%/")
 #@	ENDIF
 #@ENDP2
 #- - - End of second pass additions
@@ -491,12 +491,18 @@
 #@ENDIF
 
 ## ------- Tell which files are CGI scripts ------
-	cgi.assign +=	( "/source" => ""
-					, "/ident" => ""
-					, "/diff" => ""
-					, "/search" => ""
-					, "/showconfig" => ""
-					)
+#@IF	'' ne "%virtrootbase%"
+	$HTTP["url"] =~ "^%virtrootbase%/" {
+#@ENDIF
+		cgi.assign +=	( "/source" => ""
+						, "/ident" => ""
+						, "/diff" => ""
+						, "/search" => ""
+						, "/showconfig" => ""
+						)
+#@IF	'' ne "%virtrootbase%"
+	}
+#@ENDIF
 
 ##
 #######################################################################