Changeset 20829

Timestamp:

2009-10-21T16:08:25+13:00 (15 years ago)

Author:

ak19

Message:

PassEnv (DY)LD_LIBRARY_PATH entry added into linux/mac conf file. There's a placeholder that's written over by gsicontrol.sh. The Windows one at the moment need not be updated to do the same, as in Windows the PATH variable holds the path to various DLLs, and we don't want to expose the entire PATH unless we can't help it.

Location:

gsdl/trunk

Files:

• gsicontrol.sh (modified) (2 diffs)
• runtime-src/packages/apache-httpd/httpd.conf.in (modified) (1 diff)

gsdl/trunk/gsicontrol.sh

@@ -64 +64 @@
     fi
 
+    lib_path_var="LD_LIBRARY_PATH" ;
+    if [ $GSDLOS = "darwin"] ; then
+    lib_path_var="DYLD_LIBRARY_PATH"
+    fi
+
     if test ! -z $port ; then
     echo "Port: $port" ;
@@ -75 +80 @@
     | sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" \
     | sed "s@\*\*APACHE_HOME_OS\*\*@$GSDLHOME/apache-httpd/$GSDLOS@g" \
+    | sed "s@\*\*LIBRARY_PATH_VAR\*\*@$lib_path_var@g" \
     > "$GSDLHOME/apache-httpd/$GSDLOS/conf/httpd.conf" ;
     echo "Type '$0 web-start' to start the web server running on port $port" ;

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

@@ -39 +39 @@
 #Listen 12.34.56.78:80
 Listen **PORT**
+
+# http://httpd.apache.org/docs/1.3/mod/mod_env.html#passenv
+# Linux systems run user accounts as nobody, and so the crucial
+# dynamically linked library path environment variable doesn't
+# get passed through to apache. We make it do so here: PassEnv
+# is set to DYLD_LIBRARY_PATH for Macs, else to LD_LIBRARY_PATH.
+PassEnv **LIBRARY_PATH_VAR**
 
 #