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

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

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

Modified Files:
	lighttpd-lxrserver.conf 
Log Message:
templates/lighttpd/lighttpd-lxrserver.conf: update configuration template to new tree designation variants and new features in LCL

Index: lighttpd-lxrserver.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lighttpd/lighttpd-lxrserver.conf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- lighttpd-lxrserver.conf	22 Jan 2013 09:36:40 -0000	1.10
+++ lighttpd-lxrserver.conf	24 Sep 2013 09:56:15 -0000	1.11
@@ -462,35 +462,112 @@
 # the real site root.
 	server.document-root = "%LXRroot%/"
 
+#@IF	'H' ne "%_routing%" && 'P' ne "%_routing%"
+#@	IF	'localhost' ne "%hostname%"
 	$HTTP["host"] == "%hostname%" {
 		server.document-root = "%LXRroot%/"
 	}
-# Add more for alias names
+#@	ENDIF
+#@	ARRAY	hostaliases,H
+#@		ON none
+# Add similar block for alias names
+#	$HTTP["host"] == "alias.host.name" {
+#		server.document-root = "%LXRroot%/"
+#	}
+#@		ENDON
+	$HTTP["host"] == "%H%" {
+		server.document-root = "%LXRroot%/"
+	}
+#@	ENDA
+#@ELSEIF	'H' eq "%_routing%"
+# Edit the following conditions to remove // and port from hostname.
+# Eventually, create "socket" blocks for non default ports.
+#@ENDIF
+#@PASS2	here_hosts
+#@	IF	'H' eq "%_routing%"
+	$HTTP["host"] == "%hostname%" {
+		server.document-root = "%LXRroot%/"
+#@		IF	%_shared% && !%_commonvirtroot%
+		alias.url +=	("%virtroot%/" => "%LXRroot%/")
+#@		ENDIF
+	}
+#@	ELSEIF	'P' eq "%_routing%"
+	$HTTP["host"] == "%treeid%.%hostname%" {
+		server.document-root = "%LXRroot%/"
+#@		IF	%_shared% && !%_commonvirtroot%
+		alias.url +=	("%virtroot%/" => "%LXRroot%/")
+#@		ENDIF
+	}
+#@		ARRAY	hostaliases,H
+#@			ON none
+#	$HTTP["host"] == "%treeid%.alias_for_%hostname%" {
+#		server.document-root = "%LXRroot%/"
+#@				IF	%_shared% && !%_commonvirtroot%
+		alias.url +=	("%virtroot%/" => "%LXRroot%/")
+#@				ENDIF
+#	}
+#@			ENDON
+	$HTTP["host"] == "%treeid%.%H%" {
+		server.document-root = "%LXRroot%/"
+#@			IF	%_shared% && !%_commonvirtroot%
+		alias.url +=	("%virtroot%/" => "%LXRroot%/")
+#@			ENDIF
+	}
+#@		ENDA
+#@	ENDIF
+#@ENDP2
+#@	IF	'H' eq "%_routing%"
+#	$HTTP["host"] == "alias.host.name" {	# List here aliases for host name
+#		# Block should have same content as primary host
+#	}
+#@ENDIF
 
-## ------- URL black magic for multiple trees and sub-siting ------
+#@IF	'P' ne "%_routing%"
+#@	ARRAY	portaliases,P
+#@		ON	none
+# If incoming requests can arrive simultaneously on several ports,
+# you can add blocks (one per port) of the form:
+#	$HTTP["socket"] =~ ":XX$" {}	# with XX = port number
+# IMPORTANT! Remove duplicates
+#@		ENDON
+#@		ON prolog
+# Alternate ports
+# IMPORTANT! Remove duplicates
+#@		ENDON
+#@		IF	80 != %P%
+	$HTTP["socket"] =~ ":%P%$" {}
+#@		ENDIF
+#@	ENDA
+#@ENDIF
+#@PASS2 here_ports
+#@	IF	'P' eq "%_routing%"
+#	- port for //%treeid%.%hostname% and its aliases (do not uncomment if duplicate!)
+#@		IF	80 != %port%
+#	$HTTP["socket"] =~ ":%port%$" {}
+#@		ENDIF
+#@		ARRAY	portaliases,P
+#@			IF	80 != %P%
+#	$HTTP["socket"] =~ ":%P%$" {}
+#@			ENDIF
+#@		ENDA
+#@	ENDIF
+#@ENDP2
+#@IF	'S' eq "%_routing%" || 'E' eq "%_routing%" || %_shared%
+
+## ------- URL mapping to LXR root directory ------
 ##
 ## 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%/tree/" => "%LXRroot%/")
-#	}
-# 
 #@ENDIF
-#@IF	'' ne "%virtrootbase%"
-	$HTTP["url"] =~ "^%virtrootbase%/" {
+#@IF	%_shared% &&('N' eq "%_routing%" || 'A' eq "%_routing%" ||('H' eq "%_routing%" || 'P' eq "%_routing%") && %_commonvirtroot%)
+	alias.url +=	("%virtrootbase%/" => "%LXRroot%/")
 #@ENDIF
-#- - -
-#- - - Note: block below is interpreted during pass 2.
-#- - -
-#@PASS2 here_virtroot
-		alias.url +=	("%virtroot%/" => "%LXRroot%/")
+#@PASS2 here_alias
+#@	IF	'S' eq "%_routing%" || 'E' eq "%_routing%"
+	alias.url +=	("%virtroot%/" => "%LXRroot%/")
+#@	ENDIF
 #@ENDP2
-#- - - End of second pass additions
-#@IF	'' ne "%virtrootbase%"
-	}
-#@ENDIF
 
 ## ------- Tell which files are CGI scripts ------
 #@IF	'' ne "%virtrootbase%"