Changeset 23251

Timestamp:

2010-10-29T21:14:42+13:00 (13 years ago)

Author:

sjm84

Message:

The localhost and hostname did not work on the Ubuntu here, but should have been working. It does work if hostname and localhost are written into the httpd.conf file. To get it to do that, made changes to the server.jar code, and so also server.jar, as well as GS2 scripts and config files (httpd.conf.in files for linux and windows), llssite.cfg.in, glisite.cfg.in and gsicontrol.bat and .sh

Location:

main/trunk/greenstone3/src/java/org/greenstone/server

Files:

• Server2.java (modified) (2 diffs)
• Server2Settings.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/server/Server2.java

@@ -135 +135 @@
     }
     
+    // For some machines, localhost is not sufficient, 
+    // need hostname defined as well (e.g. Ubuntu 10.10)
+    InetAddress inetAddress = null;
+    try {
+        inetAddress = InetAddress.getLocalHost();
+        String hosts = inetAddress.getHostName();
+        ScriptReadWrite scriptReadWrite = new ScriptReadWrite();
+        ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file);
+        scriptReadWrite.replaceOrAddLine(fileLines, "hosts", hosts, true);
+        scriptReadWrite.writeOutFile(config_properties_file, fileLines);
+    } catch(UnknownHostException e) {
+        // Unable to get hostname, need to try for the default localhost without it
+    }       
+
     // If the GSI is set to NOT autoenter/autostart the server, then write url=URL_PENDING out to the file.
     // When the user finally presses the Enter Library button and so has started up the server, the correct
@@ -251 +265 @@
         logger_.info("Defaulting host IP to "+ host); // use the default        
         address_resolution_method = 2;
+        inetAddress = null;
         }
         switch(address_resolution_method) {

main/trunk/greenstone3/src/java/org/greenstone/server/Server2Settings.java

@@ -20 +20 @@
     protected JRadioButton[] hostRadioButtons = new JRadioButton[4];
 
-    // 0 to 3: 0 is resolve (hostname) from local IP, 1 is local IP address, 2 is localhost, 3 is 127.0.0.1
+    // 0 to 3: 0 is resolved (hostname) from local IP, 1 is local IP address, 2 is localhost, 3 is 127.0.0.1
     protected int address_resolution_method = 2;
     protected int externalaccess = 0;
@@ -115 +115 @@
     // work out the host (default is address_resolution_method 2: localhost)
     String hostIP = "127.0.0.1";
+    String hosts = "";
     InetAddress inetAddress = null;
     try {
         inetAddress = InetAddress.getLocalHost();
+        hosts = inetAddress.getHostName();
         hostIP = inetAddress.getHostAddress(); // used for all cases unless an Exception is thrown here
     } catch(UnknownHostException e) {
@@ -123 +125 @@
         logger.info("Server2.java reload(): Defaulting host URL to localhost");
         hostIP = "127.0.0.1";
+        hosts = "";
         address_resolution_method = 2;      
     }
 
     newFileLines = scriptReadWrite.replaceOrAddLine(newFileLines, "hostIP", hostIP, true);
+    newFileLines = scriptReadWrite.replaceOrAddLine(newFileLines, "hosts", hosts, true);
 
     // address resolution method - onSave() would have updated