Changeset 18814 for gsdl/trunk/runtime-src/packages/apache-httpd

Timestamp:

2009-03-26T20:30:08+13:00 (15 years ago)

Author:

ak19

Message:

Making the apache webserver relocatable for the release-kit. 1. Modified httpd.conf.in (GSDLHOME/apache-httpd/GSDLOS placeholder now APACHE_HOME_OS); 2. Modified the install-bindist.sh script for installing the relocatable apache webserver so that it is customised and doesn't do more than we need; 3. Added in apxs.in from the webserver's Support folder (inside httpd-2.2.11 folder). Do we get it from there dynamically or keep a static copy here?

Location:

gsdl/trunk/runtime-src/packages/apache-httpd

Files:

• apxs.in (added)
• httpd.conf.in (modified) (8 diffs)
• install-bindist.sh (added)

gsdl/trunk/runtime-src/packages/apache-httpd/httpd.conf.in

@@ -15 +15 @@
 # server will use that explicit path.  If the filenames do *not* begin
 # with "/", the value of ServerRoot is prepended -- so "logs/foo_log"
-# with ServerRoot set to "**GSDLHOME**/apache-httpd/**GSDLOS**" will be interpreted by the
-# server as "**GSDLHOME**/apache-httpd/**GSDLOS**/logs/foo_log".
+# with ServerRoot set to "**APACHE_HOME_OS**" will be interpreted by the
+# server as "**APACHE_HOME_OS**/logs/foo_log".
 
 #
@@ -27 +27 @@
 # httpd daemons, you will need to change at least LockFile and PidFile.
 #
-ServerRoot "**GSDLHOME**/apache-httpd/**GSDLOS**"
+ServerRoot "**APACHE_HOME_OS**"
 
 #
@@ -102 +102 @@
 # symbolic links and aliases may be used to point to other locations.
 #
-DocumentRoot "**GSDLHOME**/apache-httpd/**GSDLOS**/htdocs"
+DocumentRoot "**APACHE_HOME_OS**/htdocs"
 
 #
@@ -129 +129 @@
 # This should be changed to whatever you set DocumentRoot to.
 #
-<Directory "**GSDLHOME**/apache-httpd/**GSDLOS**/htdocs">
+<Directory "**APACHE_HOME_OS**/htdocs">
     #
     # Possible values for the Options directive are "None", "All",
@@ -249 +249 @@
     # directives as to Alias.
     #
-    ScriptAlias /cgi-bin/ "**GSDLHOME**/apache-httpd/**GSDLOS**/cgi-bin/"
+    ScriptAlias /cgi-bin/ "**APACHE_HOME_OS**/cgi-bin/"
 
 </IfModule>
@@ -262 +262 @@
 
 #
-# "**GSDLHOME**/apache-httpd/**GSDLOS**/cgi-bin" should be changed to whatever your ScriptAliased
+# "**APACHE_HOME_OS**/cgi-bin" should be changed to whatever your ScriptAliased
 # CGI directory exists, if you have that configured.
 #
-<Directory "**GSDLHOME**/apache-httpd/**GSDLOS**/cgi-bin">
+<Directory "**APACHE_HOME_OS**/cgi-bin">
     AllowOverride None
     Options None
@@ -408 +408 @@
 SSLRandomSeed connect builtin
 </IfModule>
-
 
   ScriptAlias /greenstone/cgi-bin "**GSDLHOME**/cgi-bin"
@@ -423 +422 @@
      Allow from all
   </Directory>
-