Changeset 23988
- Timestamp:
- 2011-05-04T16:59:30+12:00 (13 years ago)
- Location:
- main/trunk/greenstone2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/gs2-server.sh
r23983 r23988 153 153 fi 154 154 155 # whenever the server is started up, make sure gsdlhome is correct (in case the install was moved). 156 # Need to redirect both stderr and stdout (with &>) into the void, since reset-gsdlhome makes 157 # web-stop-tested output an "error" as there's no httpd.conf.in at the stage when web-stop is called. 155 # whenever the server is started up, make sure gsdlhome is correct (in case the gs install was moved). 156 # If both stderr and stdout need to be redirected into the void (with &>/dev/null), see 158 157 # http://linuxwave.blogspot.com/2008/03/redirecting-stdout-and-stderr.html 159 ./gsicontrol.sh reset-gsdlhome &>/dev/null158 ./gsicontrol.sh reset-gsdlhome >/dev/null 160 159 161 160 if [ "x$silent" == "x" -o "x$silent" != "xtrue" ]; then -
main/trunk/greenstone2/gsicontrol.sh
r23982 r23988 39 39 echo "# **** This file is automatically generated, do not edit ****" > "$cgibin/gsdlsite.cfg" ; 40 40 echo "# For local customization of Greenstone, edit gsdlsite.cfg.in" >> "$cgibin/gsdlsite.cfg" ; 41 echo "" >> "$cgibin/gsdlsite.cfg" ; 41 42 sed "s@\*\*GSDLHOME\*\*@$GSDLHOME@g" "$cgibin/gsdlsite.cfg.in" >> "$cgibin/gsdlsite.cfg" ; 42 43 else … … 94 95 if test ! -z $port ; then 95 96 echo "Port: $port" ; 96 echo "Stopping web server (if running)" ; 97 web-stop-tested ; 97 # if called by reset-gsdlhome, then httpd.conf file was regenerated by install-bindist.sh script and 98 # contains placeholder strings, including for Listen port. So can't stop web-server in such a case. 99 if test -e "$GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH/conf/httpd.conf" ; then 100 confport=`egrep "^Listen" $GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH/conf/httpd.conf | awk '{print $2}'` ; 101 if [ "$confport" != "**PORT**" ] ; then 102 echo "Stopping web server (if running)" ; 103 web-stop-tested ; 104 fi 105 fi 98 106 echo "Setting config file to use port $port"; 99 107 cat "$GSDLHOME/apache-httpd/$GSDLOS$GSDLARCH/conf/httpd.conf.in" \ … … 215 223 216 224 /bin/cp "$apache_home_os/build/config_vars.mk.in" "$apache_home_os/build/config_vars.mk" 217 225 226 # replace template files with active versions. The following will generate a httpd.conf 227 # file with placeholder strings, all of which we'll replace shortly hereafter. 218 228 bash "$apache_home_os/install-bindist.sh" "$apache_home_os" 219 229
Note:
See TracChangeset
for help on using the changeset viewer.