Changeset 20829

Show
Ignore:
Timestamp:
21.10.2009 16:08:25 (10 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:
2 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/gsicontrol.sh

    r20637 r20829  
    6464    fi 
    6565 
     66    lib_path_var="LD_LIBRARY_PATH" ; 
     67    if [ $GSDLOS = "darwin"] ; then 
     68    lib_path_var="DYLD_LIBRARY_PATH" 
     69    fi 
     70 
    6671    if test ! -z $port ; then 
    6772    echo "Port: $port" ; 
     
    7580    | sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" \ 
    7681    | sed "s@\*\*APACHE_HOME_OS\*\*@$GSDLHOME/apache-httpd/$GSDLOS@g" \ 
     82    | sed "s@\*\*LIBRARY_PATH_VAR\*\*@$lib_path_var@g" \ 
    7783    > "$GSDLHOME/apache-httpd/$GSDLOS/conf/httpd.conf" ; 
    7884    echo "Type '$0 web-start' to start the web server running on port $port" ; 
  • gsdl/trunk/runtime-src/packages/apache-httpd/httpd.conf.in

    r20624 r20829  
    3939#Listen 12.34.56.78:80 
    4040Listen **PORT** 
     41 
     42# http://httpd.apache.org/docs/1.3/mod/mod_env.html#passenv 
     43# Linux systems run user accounts as nobody, and so the crucial 
     44# dynamically linked library path environment variable doesn't 
     45# get passed through to apache. We make it do so here: PassEnv 
     46# is set to DYLD_LIBRARY_PATH for Macs, else to LD_LIBRARY_PATH. 
     47PassEnv **LIBRARY_PATH_VAR** 
    4148 
    4249#