Changeset 23251

Show
Ignore:
Timestamp:
29.10.2010 21:14:42 (9 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/server/Server2.java

    r22660 r23251  
    135135    } 
    136136     
     137    // For some machines, localhost is not sufficient,  
     138    // need hostname defined as well (e.g. Ubuntu 10.10) 
     139    InetAddress inetAddress = null; 
     140    try { 
     141        inetAddress = InetAddress.getLocalHost(); 
     142        String hosts = inetAddress.getHostName(); 
     143        ScriptReadWrite scriptReadWrite = new ScriptReadWrite(); 
     144        ArrayList fileLines = scriptReadWrite.readInFile(BaseServer.config_properties_file); 
     145        scriptReadWrite.replaceOrAddLine(fileLines, "hosts", hosts, true); 
     146        scriptReadWrite.writeOutFile(config_properties_file, fileLines); 
     147    } catch(UnknownHostException e) { 
     148        // Unable to get hostname, need to try for the default localhost without it 
     149    }        
     150 
    137151    // If the GSI is set to NOT autoenter/autostart the server, then write url=URL_PENDING out to the file. 
    138152    // When the user finally presses the Enter Library button and so has started up the server, the correct 
     
    251265        logger_.info("Defaulting host IP to "+ host); // use the default         
    252266        address_resolution_method = 2; 
     267        inetAddress = null; 
    253268        } 
    254269        switch(address_resolution_method) { 
  • main/trunk/greenstone3/src/java/org/greenstone/server/Server2Settings.java

    r22085 r23251  
    2020    protected JRadioButton[] hostRadioButtons = new JRadioButton[4]; 
    2121 
    22     // 0 to 3: 0 is resolve (hostname) from local IP, 1 is local IP address, 2 is localhost, 3 is 127.0.0.1 
     22    // 0 to 3: 0 is resolved (hostname) from local IP, 1 is local IP address, 2 is localhost, 3 is 127.0.0.1 
    2323    protected int address_resolution_method = 2; 
    2424    protected int externalaccess = 0; 
     
    115115    // work out the host (default is address_resolution_method 2: localhost) 
    116116    String hostIP = "127.0.0.1"; 
     117    String hosts = ""; 
    117118    InetAddress inetAddress = null; 
    118119    try { 
    119120        inetAddress = InetAddress.getLocalHost(); 
     121        hosts = inetAddress.getHostName(); 
    120122        hostIP = inetAddress.getHostAddress(); // used for all cases unless an Exception is thrown here 
    121123    } catch(UnknownHostException e) { 
     
    123125        logger.info("Server2.java reload(): Defaulting host URL to localhost"); 
    124126        hostIP = "127.0.0.1"; 
     127        hosts = ""; 
    125128        address_resolution_method = 2;       
    126129    } 
    127130 
    128131    newFileLines = scriptReadWrite.replaceOrAddLine(newFileLines, "hostIP", hostIP, true); 
     132    newFileLines = scriptReadWrite.replaceOrAddLine(newFileLines, "hosts", hosts, true); 
    129133 
    130134    // address resolution method - onSave() would have updated