Changeset 18728

Timestamp:

2009-03-20T17:12:34+13:00 (15 years ago)

Author:

ak19

Message:

1. Correction to the make target web-stop-tested which previously prevented the generation of the httpd.conf file upon make configure-web BUT ONLY when the Java code ran it. 2. Undid the changes made in the previous commit (to do with the SERVERNAME placeholder in httpd.conf.in)

File:

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

gsdl/trunk/GSI-Makefile

@@ -61 +61 @@
           echo "Stopping web server (if running)" ; \
           make -f GSI-Makefile web-stop-tested ; \
-          server=`egrep "^apache.server" lib/java/build.properties | awk -F= '{print $$2}'` ; \
-          echo "Setting config file to use port $$port and server $$server"; \
+          echo "Setting config file to use port $$port"; \
           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" ; \
@@ -84 +82 @@
 configure-apache: test-gsdlhome
     @ echo "Configuring the apache webserver..." ;
-    @ ( port=`egrep "^apache.port" lib/java/build.properties | awk -F= '{print $$2}'` ; \
+    @ ( port=`egrep "^apache.port" ${GSDLHOME}/lib/java/build.properties | awk -F= '{print $$2}'` ; \
         echo $$port | make -f GSI-Makefile configure-port ; )
-    @ echo $(MONITOR_SUCCESS)
+    @ if test -e "${GSDLHOME}/apache-httpd/conf/httpd.conf" ; then \
+      echo $(MONITOR_SUCCESS); \
+    else \
+      echo $(MONITOR_FAILED); \
+    fi
     @ echo $(MONITOR_FINISHED)
 
@@ -118 +120 @@
       ${GSDLHOME}/apache-httpd/${GSDLOS}/bin/apachectl stop ; \
     fi
+
+web-stop: test-gsdlhome web-stop-tested
     @ echo $(MONITOR_SUCCESS)
     @ echo $(MONITOR_FINISHED)
-
-web-stop: test-gsdlhome web-stop-tested