Changeset 18763

Show
Ignore:
Timestamp:
23.03.2009 19:27:52 (10 years ago)
Author:
ak19
Message:

Apache configure prefix has been adjusted in the configure file in the runtime-src/packages folder, so that the apache subfolders are extracted inside the GSDLOS folder. Need to take this into account in the httpd.conf file that is generated, so added GSDLOS placeholders as necessary.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/runtime-src/packages/apache-httpd/httpd.conf.in

    r18727 r18763  
    1515# server will use that explicit path.  If the filenames do *not* begin 
    1616# with "/", the value of ServerRoot is prepended -- so "logs/foo_log" 
    17 # with ServerRoot set to "**GSDLHOME**/apache-httpd" will be interpreted by the 
    18 # server as "**GSDLHOME**/apache-httpd/logs/foo_log". 
     17# with ServerRoot set to "**GSDLHOME**/apache-httpd/**GSDLOS**" will be interpreted by the 
     18# server as "**GSDLHOME**/apache-httpd/**GSDLOS**/logs/foo_log". 
    1919 
    2020# 
     
    2727# httpd daemons, you will need to change at least LockFile and PidFile. 
    2828# 
    29 ServerRoot "**GSDLHOME**/apache-httpd" 
     29ServerRoot "**GSDLHOME**/apache-httpd/**GSDLOS**" 
    3030 
    3131# 
     
    102102# symbolic links and aliases may be used to point to other locations. 
    103103# 
    104 DocumentRoot "**GSDLHOME**/apache-httpd/htdocs" 
     104DocumentRoot "**GSDLHOME**/apache-httpd/**GSDLOS**/htdocs" 
    105105 
    106106# 
     
    129129# This should be changed to whatever you set DocumentRoot to. 
    130130# 
    131 <Directory "**GSDLHOME**/apache-httpd/htdocs"> 
     131<Directory "**GSDLHOME**/apache-httpd/**GSDLOS**/htdocs"> 
    132132    # 
    133133    # Possible values for the Options directive are "None", "All", 
     
    249249    # directives as to Alias. 
    250250    # 
    251     ScriptAlias /cgi-bin/ "**GSDLHOME**/apache-httpd/cgi-bin/" 
     251    ScriptAlias /cgi-bin/ "**GSDLHOME**/apache-httpd/**GSDLOS**/cgi-bin/" 
    252252 
    253253</IfModule> 
     
    262262 
    263263# 
    264 # "**GSDLHOME**/apache-httpd/cgi-bin" should be changed to whatever your ScriptAliased 
     264# "**GSDLHOME**/apache-httpd/**GSDLOS**/cgi-bin" should be changed to whatever your ScriptAliased 
    265265# CGI directory exists, if you have that configured. 
    266266# 
    267 <Directory "**GSDLHOME**/apache-httpd/cgi-bin"> 
     267<Directory "**GSDLHOME**/apache-httpd/**GSDLOS**/cgi-bin"> 
    268268    AllowOverride None 
    269269    Options None