Changeset 18726 for gsdl/trunk

Timestamp:

2009-03-20T15:46:24+13:00 (15 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

File:

• gsdl/trunk/GSI-Makefile (modified) (2 diffs)

gsdl/trunk/GSI-Makefile

@@ -61 +61 @@
           echo "Stopping web server (if running)" ; \
           make -f GSI-Makefile web-stop-tested ; \
-          echo "Setting config file to use port $$port"; \
+          server=`egrep "^apache.server" lib/java/build.properties | awk -F= '{print $$2}'` ; \
+          echo "Setting config file to use port $$port and server $$server"; \
           cat "${GSDLHOME}/apache-httpd/conf/httpd.conf.in" \
         | sed "s@\*\*PORT\*\*@$$port@g" \
+            | sed "s@\*\*SERVERNAME\*\*@$$server@g" \
         | sed "s@\*\*GSDLHOME\*\*@${GSDLHOME}@g" \
         > "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; \
@@ -114 +116 @@
     @# out the values of GSDLHOME and GSDLOS
     @ if test -e "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; then \
-        ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl stop ; \
+      ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl stop ; \
     fi
     @ echo $(MONITOR_SUCCESS)