Changeset 20603

Timestamp:

2009-09-15T20:08:34+12:00 (14 years ago)

Author:

ak19

Message:

Changes to Server.jar and affected files to add address_resolution options. 1. glisite.cfg.in and llssite.cfg.in have a host property where the host as specified or resolved from IP is stored. 2. gsicontrol.sh changed to set AllowFrom value to either the host specified OR to All if allow from all is checked in the GSI dialog. 3. New string properties added to server.properties for the updated GSI dialog for GS2. 4. log4j.properties.in updated so that the logger now can write to the console as well as the logfile specified (server.log in this case). At present only ERROR messages written to the logger are displayed in the console as well as logger message types that are higher up in the log4j hierarchy. 5. Server.jar updated after the changes to the GS3 server code (recompiled with Java 5).

Location:

gsdl/trunk

Files:

• glisite.cfg.in (modified) (1 diff)
• gsicontrol.sh (modified) (3 diffs)
• lib/java/log4j.properties.in (modified) (2 diffs)
• lib/java/server.jar (modified) ( previous)
• lib/java/server.properties (modified) (3 diffs)
• llssite.cfg.in (modified) (1 diff)

gsdl/trunk/glisite.cfg.in

@@ -9 +9 @@
 start_browser=0
 address_resolution_method=2
-
+host=localhost

gsdl/trunk/gsicontrol.sh

@@ -58 +58 @@
         allowfrom="all"
     else 
-        allowfrom="127.0.0.1"
+    echo "Enter host (hostname, IP, localhost, 127.0.0.1) to use:"
+    read host ;
+    allowfrom=$host
+    if [ $allowfrom == "localhost" ]; then
+        allowfrom="127.0.0.1" ;
+    fi
     fi
 
@@ -94 +99 @@
     echo "Configuring the apache webserver..." ;
     port=`egrep "^portnumber" $configfile | awk -F= '{print $2}'` ;
-
+    
     externalaccess=`egrep "^externalaccess" $configfile | awk -F= '{print $2}'` ;
     if [ $externalaccess == "1" ] ; then 
@@ -100 +105 @@
     else
     externalaccess="no"
-    fi
-
-    echo -e "$port\n$externalaccess" | _configure-port-and-connection ;
+    host=`egrep "^host" $configfile | awk -F= '{print $2}'` ;
+    fi
+
+    echo -e "$port\n$externalaccess\n$host" | _configure-port-and-connection ;
     if test -e "$GSDLHOME/apache-httpd/$GSDLOS/conf/httpd.conf" ; then
     echo $MONITOR_SUCCESS;

gsdl/trunk/lib/java/log4j.properties.in

@@ -12 +12 @@
 
 #####configure the loggers####
-##general logger                                                   
+##general logger
 log4j.rootCategory=INFO, infolog
 
@@ -22 +22 @@
 ##Set to INFO if you want INFO (success) messages to appear as well
 ##Set to WARN if you want to turn INFO and DEBUG messages off.
-log4j.category.org.greenstone.server=INFO, serverlog
+log4j.category.org.greenstone.server=INFO, stdout, serverlog
 log4j.additivity.org.greenstone.server=false
 
-#####configure appenders and their oprions####                                  
+#####configure appenders and their options####
+##console logger - send only ERROR messages out to the console
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Threshold=ERROR
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+
 ##general logger
 log4j.appender.infolog=org.apache.log4j.RollingFileAppender

gsdl/trunk/lib/java/server.properties

@@ -2 +2 @@
 Server2Settings.Port=Apache port:
 Server2Settings.URL=Library URL prefix:
+Server2Settings.ExternalAccess=Allow external connections
+Server2Settings.ResolveIP=Get local IP and resolve to a name
+Server2Settings.LocalIP=Get local IP
+Server2Settings.AlwaysUse=Always use
 Server2Control.Version=Version 2-trunk
 Server2Control.Title=Greenstone 2 Digital Library
@@ -19 +23 @@
 ServerSettings.ChooseBrowser=Enter library using:
 ServerSettings.Browse=Browse
+ServerSettings.SettingChanged=The new settings will be available after the server has been restarted
 
 ServerControl.EnterLibrary=Enter Library
@@ -37 +42 @@
 ServerControl.Failed={0} failed
 ServerControl.Success={0} success
-ServerSetting.SettingChanged=The new settings will be available after the server has been restarted

gsdl/trunk/llssite.cfg.in

@@ -9 +9 @@
 start_browser=1
 address_resolution_method=2
+host=localhost