Changeset 18726 for gsdl

Show
Ignore:
Timestamp:
20.03.2009 15:46:24 (11 years ago)
Author:
ak19
Message:

Now configuring the webserver (which eventually calls configure-port) replaces the SERVERNAME placeholder with the apache.server value in build.properties

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/GSI-Makefile

    r18707 r18726  
    6161          echo "Stopping web server (if running)" ; \ 
    6262          make -f GSI-Makefile web-stop-tested ; \ 
    63           echo "Setting config file to use port $$port"; \ 
     63          server=`egrep "^apache.server" lib/java/build.properties | awk -F= '{print $$2}'` ; \ 
     64          echo "Setting config file to use port $$port and server $$server"; \ 
    6465          cat "${GSDLHOME}/apache-httpd/conf/httpd.conf.in" \ 
    6566        | sed "s@\*\*PORT\*\*@$$port@g" \ 
     67            | sed "s@\*\*SERVERNAME\*\*@$$server@g" \ 
    6668        | sed "s@\*\*GSDLHOME\*\*@${GSDLHOME}@g" \ 
    6769        > "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; \ 
     
    114116    @# out the values of GSDLHOME and GSDLOS 
    115117    @ if test -e "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; then \ 
    116         ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl stop ; \ 
     118      ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl stop ; \ 
    117119    fi 
    118120    @ echo $(MONITOR_SUCCESS)