[Lxr-commits] CVS: lxr/templates/Apache apache-lxrserver.conf, 1.6, 1.7 htaccess-generic, 1.6, 1.7
Brought to you by:
ajlittoz
Menu
▾
▴
[Lxr-commits] CVS: lxr/templates/Apache apache-lxrserver.conf, 1.6, 1.7 htaccess-generic, 1.6, 1.7
|
From: Andre-Littoz <ajl...@us...> - 2013-09-03 08:56:20
|
Update of /cvsroot/lxr/lxr/templates/Apache In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30861/templates/Apache Modified Files: apache-lxrserver.conf htaccess-generic Log Message: templates/Apache/apache-lxrserver.conf, htaccess-generic: Apache support maintenance Upgrade to new LCL version, adaptation to variants of tree designation in URL Index: apache-lxrserver.conf =================================================================== RCS file: /cvsroot/lxr/lxr/templates/Apache/apache-lxrserver.conf,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- apache-lxrserver.conf 21 Jan 2013 10:49:36 -0000 1.6 +++ apache-lxrserver.conf 3 Sep 2013 08:56:16 -0000 1.7 @@ -1,5 +1,5 @@ # -# Web server configuration for LXR server +# LXR Apache server configuration # # $Id$ # @@ -8,62 +8,140 @@ # directive syntax and semantics changed between releases. # When updating 2.2 -> 2.4, uncomment 2.4 specific lines #@IF !%Apache24% -#@ ASK Is your Apache version 2.4 or higher?; 1; yes, no; y, n -#@ DEFINE Apache24="%A%" +#@ ASK,Apache24 Is your Apache version 2.4 or higher?; 1; yes, no; y, n #@ENDIF -#@IF 80 != %port% && 8080 != %port% && 443 != %port% +# ================================================= +# ------- Port list ------- +# +# (only if different from 80, 8080 or 443) +# NOTE: remove duplicate ports since they cause trouble +# and uncomment the remaining ones. + +#@IF 'H' ne "%_routing%" && 'P' ne "%_routing%" +#@ IF 80 != %port% && 8080 != %port% && 443 != %port% Listen %port% +#@ ENDIF +#@ ARRAY portaliases,P +#@ IF 80 != %P% && 8080 != %P% && 443 != %P% +#Listen %P% +#@ ENDIF +#@ ENDA +#@ENDIF +#@PASS2 here_ports +#@ IF 'H' eq "%_routing%" +#Listen XX +# where XX = port number for host %hostname% +#@ ELSEIF 'P' eq "%_routing%" +# - host //%treeid%.%hostname% and its aliases +#@ IF 80 != %port% && 8080 != %port% && 443 != %port% +#Listen %port% +#@ ENDIF +#@ ARRAY portaliases,P +#@ IF 80 != %P% && 8080 != %P% && 443 != %P% +#Listen %P% +#@ ENDIF +#@ ENDA +#@ ENDIF +#@ENDP2 +#@IF 'n' eq "%Apache24%" + + +# The following directive is deprecated in 2.4 and becomes a no-op +NameVirtualHost * #@ENDIF +#@IF 'H' ne "%_routing%" && 'P' ne "%_routing%" -#@IF %_virthost% +#@ IF 'localhost' ne "%hostname%" || %hostaliases% # ================================================= # -# ------- LXR as an independent site ------ +# ------- LXR host name and aliases ------ +# + +<VirtualHost *> + DocumentRoot %LXRroot% + ServerName %hostname% +#@ ARRAY hostaliases,H +#@ ON none +# ServerAlias # List here the aliases for host name +#@ ENDON + ServerAlias %H% +#@ ENDA +</VirtualHost> +#@ ENDIF +#@ELSE +# ================================================= +# +# ------- LXR host names and aliases ------ # -#@IF 'n' eq "%Apache24%" -# The following directive is deprecated in 2.4 and becomes a no-op -NameVirtualHost * #@ENDIF +#@PASS2 here_hosts +#@ IF 'H' eq "%_routing%" <VirtualHost *> DocumentRoot %LXRroot% ServerName %hostname% # ServerAlias # List here the aliases for host name +#@ IF %_shared% && !%_commonvirtroot% + Alias %virtroot% "%LXRroot%" +#@ ENDIF +</VirtualHost> +#@ ELSEIF 'P' eq "%_routing%" + +<VirtualHost *> + DocumentRoot %LXRroot% + ServerName %treeid%.%hostname% +#@ ARRAY hostaliases,H +#@ ON none +# ServerAlias # List here the aliases for host name +#@ ENDON + ServerAlias %treeid%.%H% +#@ ENDA +#@ IF %_shared% && !%_commonvirtroot% + Alias %virtroot% "%LXRroot%" +#@ ENDIF </VirtualHost> +#@ ENDIF +#@ENDP2 +#@IF 'E' eq "%_routing%" -#@ENDIF %_virthost% # ================================================= # # ------- URL black magic for multiple trees ------ # # NOTE: this is the built-in default management method. -# Adapt it to fit your custom management. -#@IF %_singlecontext% -# Uncomment for multiple trees operation + +#@ IF 'c' eq %_virtrootpolicy% #AliasMatch ^%virtrootbase%/[^/]+/(.*) "%LXRroot%/$1" -#@ELSE -# Comment out for single tree operation + +### REMINDER ### +### Adapt the previous regular expression to fit your selection method +### REMINDER ### +#@ ELSEIF 'b' eq %_virtrootpolicy% AliasMatch ^%virtrootbase%/[^/]+/(.*) "%LXRroot%/$1" -#@ENDIF +#@ ELSE +### ERROR ### ERROR ### ERROR ### Unknown selection method! +#@ ENDIF +#@ELSE +#@ IF 'S' eq "%_routing%" || %_shared% + # ================================================= # -# ------- Simple URL for a single tree ------ +# ------- URL mapping to LXR directory ------ # -#@IF '' eq %virtrootbase% -# Nothing to be done since LXR is located at root of server -#@ELSE -#@ IF %_singlecontext% -# Comment out for multiple trees operation +#@ ENDIF +#@ IF %_shared% &&('N' eq "%_routing%" || 'A' eq "%_routing%" ||('H' eq "%_routing%" || 'P' eq "%_routing%") && %_commonvirtroot%) Alias %virtrootbase% "%LXRroot%" -#@ ELSE -# Uncomment for single tree operation -# Alias %virtrootbase% "%LXRroot%" #@ ENDIF #@ENDIF +#@PASS2 here_alias +#@ IF 'S' eq "%_routing%" +Alias %virtroot% "%LXRroot%" +#@ ENDIF +#@ENDP2 # ================================================= Index: htaccess-generic =================================================================== RCS file: /cvsroot/lxr/lxr/templates/Apache/htaccess-generic,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- htaccess-generic 21 Jan 2013 10:49:36 -0000 1.6 +++ htaccess-generic 3 Sep 2013 08:56:16 -0000 1.7 @@ -13,8 +13,7 @@ # directive syntax and semantics changed between releases. # When updating 2.2 -> 2.4, uncomment 2.4 specific lines #@IF !%Apache24% -#@ ASK Is your Apache version 2.4 or higher?; 1; yes, no; y, n -#@ DEFINE Apache24="%A%" +#@ ASK,Apache24 Is your Apache version 2.4 or higher?; 1; yes, no; y, n #@ENDIF |
