[Lxr-commits] CVS: lxr/templates/Apache apache-lxrserver.conf, 1.3, 1.4 apache2-require.pl, 1.1, 1.2

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

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

Modified Files:
	apache-lxrserver.conf apache2-require.pl 
Log Message:
Configuration process: part 3/5
Upgrade Apache templates


Index: apache-lxrserver.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/Apache/apache-lxrserver.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- apache-lxrserver.conf	22 Sep 2012 12:49:45 -0000	1.3
+++ apache-lxrserver.conf	11 Jan 2013 12:06:13 -0000	1.4
@@ -16,8 +16,11 @@
 #
 #	Uncomment for multiple trees operation
 # ----------------> absolute path to the LXR root directory
-#=m=	AliasMatch ^/lxr/[^/]+/(.*) "%LXRroot%/$1"
-
+#@IF %_singlecontext%
+#	AliasMatch ^/lxr/[^/]+/(.*) "%LXRroot%/$1"
+#@ELSE
+	AliasMatch ^/lxr/[^/]+/(.*) "%LXRroot%/$1"
+#@ENDIF
 
 # =================================================
 #
@@ -25,7 +28,11 @@
 #
 #	Uncomment for single tree operation
 # ----------------> absolute path to the LXR root directory
-#=s=	Alias /lxr "%LXRroot%"
+#@IF %_singlecontext%
+	Alias /lxr "%LXRroot%"
+#@ELSE
+#	Alias /lxr "%LXRroot%"
+#@ENDIF
 
 
 # =================================================
@@ -60,11 +67,11 @@
 	# versions of mod_perl.
 	<IfDefine MODPERL2>
 	# ----------------> absolute path to the LXR root directory
-		PerlPostConfigRequire %LXRroot%/custom.d/apache2-require.pl
+		PerlPostConfigRequire %LXRroot%/%LXRconfdir%/apache2-require.pl
 	</IfDefine>
 	<IfDefine !MODPERL2>
 	# ----------------> absolute path to the LXR root directory
-		PerlRequire %LXRroot%/custom.d/apache2-require.pl
+		PerlRequire %LXRroot%/%LXRconfdir%/apache2-require.pl
 	</IfDefine>
 </IfModule>
 

Index: apache2-require.pl
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/Apache/apache2-require.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apache2-require.pl	23 Jan 2012 08:55:02 -0000	1.1
+++ apache2-require.pl	11 Jan 2013 12:06:14 -0000	1.2
@@ -1,4 +1,16 @@
 #!/usr/bin/env perl -w
+# Apache mod_perl additional configuration file
+#
+#-	$Id$
+#-
+#-
+#-	This configuration file is fully configured by script
+#-	configure-lxr.pl (along with all other files).
+#-
+#	If configured manually, it could be worth to use relative
+#	file paths so that this file is location independent.
+#	Relative file paths are here relative to LXR root directory.
+
 @INC=	( @INC
 		, "%LXRroot%"		# <- LXR root directory
 		, "%LXRroot%/lib"	# <- LXR library directory