diff --git a/htroot/Network.java b/htroot/Network.java
index d5afeff1e..542ace43b 100644
--- a/htroot/Network.java
+++ b/htroot/Network.java
@@ -193,7 +193,7 @@ public class Network {
// generate table
int page = Integer.parseInt(post.get("page", "1"));
int conCount = 0;
- int maxCount = 100;
+ int maxCount = 500;
if (yacyCore.seedDB == null) {
prop.put("table", 0);//no remote senior/principal proxies known"
} else {
@@ -256,7 +256,7 @@ public class Network {
prop.put("table_list_"+conCount+"_type", 2);
prop.put("table_list_"+conCount+"_type_url", seed.get("seedURL", "http://nowhere/") );
}
- prop.put("table_list_"+conCount+"_version", seed.get("Version", "-"));
+ prop.put("table_list_"+conCount+"_version", yacy.combinedVersionString2PrettyString(seed.get("Version", "0.1")));
prop.put("table_list_"+conCount+"_contact", (seed.getFlagDirectConnect() ? 1 : 0) );
prop.put("table_list_"+conCount+"_lastSeen", lastSeen(seed.get("LastSeen", "-")) );
prop.put("table_list_"+conCount+"_uptime", serverDate.intervalToString(60000 * Long.parseLong(seed.get("Uptime", "0"))));
diff --git a/htroot/Performance_p.java b/htroot/Performance_p.java
index 67e434b98..67b01fcc4 100644
--- a/htroot/Performance_p.java
+++ b/htroot/Performance_p.java
@@ -145,7 +145,11 @@ public class Performance_p {
// check values to prevent short-cut loops
if (idlesleep < 1000) idlesleep = 1000;
if (threadName.equals("10_httpd")) { idlesleep = 0; busysleep = 0; memprereq = 0; }
-
+ if ((threadName.equals("50_localcrawl")) && (busysleep < 100)) busysleep = 100;
+ if ((threadName.equals("61_globalcrawltrigger")) && (busysleep < 100)) busysleep = 100;
+ if ((threadName.equals("62_remotetriggeredcrawl")) && (busysleep < 100)) busysleep = 100;
+
+
// on-the-fly re-configuration
switchboard.setThreadPerformance(threadName, idlesleep, busysleep, memprereq);
switchboard.setConfig(threadName + "_idlesleep", idlesleep);
diff --git a/htroot/SettingsAck_p.java b/htroot/SettingsAck_p.java
index f1a02ccd5..cc446a28c 100644
--- a/htroot/SettingsAck_p.java
+++ b/htroot/SettingsAck_p.java
@@ -297,8 +297,9 @@ public class SettingsAck_p {
// check if peer name already exists
String peerName = (String) post.get("peername");
- String staticIP = (String)post.get("staticIP");
- env.setConfig("staticIP", staticIP);
+ String staticIP = (String)post.get("staticIP");
+ env.setConfig("staticIP", staticIP);
+ if (staticIP.length() > 0) yacyCore.seedDB.mySeed.put("IP", staticIP);
yacySeed oldSeed = yacyCore.seedDB.lookupByName(peerName);
if ((oldSeed == null) || (env.getConfig("peerName","").equals(peerName))) {
diff --git a/htroot/Settings_p.html b/htroot/Settings_p.html
index 1f9578d44..7d12c2698 100644
--- a/htroot/Settings_p.html
+++ b/htroot/Settings_p.html
@@ -70,14 +70,20 @@ delete the file 'DATA/SETTINGS/httpProxy.conf' in the YaCy application root fold
Peer Name:
-
Your peer name defines also a new '.yacy' - domain, which can be accessed from every peer running this proxy.
- Using your 'Home Page' and 'File Share' - zones you also have a platform to provide content to your new domain.
+
Your peer name defines also a new '.yacy' - domain, which can be accessed from every peer running this proxy.
+ Using your 'Home Page' and 'File Share' - zones you also have a platform to provide content to your new domain. (hint: Choose a name that appears on a web page that tells something about you, visit the page, get the 'senior' status, and you can be found...)
-
staticIP(optional):
+
staticIP (optional):
-
If you have a static IP or a dyndns Account, enter it here to shorten the bootstrapping.
+
The staticIP can help that your peer can be reached by other peers in case that your
+ peer is behind a firewall or proxy. You can create a tunnel through the firewall/proxy
+ (look out for 'tunneling through https proxy with connect command') and create
+ an access point for incoming connections.
+ This access address can be set here (either as IP number or domain name).
+ If the address of outgoing connections is equal to the address of incoming connections,
+ you don't need to set anything here, please leave it blank.
diff --git a/htroot/Status.html b/htroot/Status.html
index 32bd2aaf7..2048a6056 100644
--- a/htroot/Status.html
+++ b/htroot/Status.html
@@ -34,7 +34,7 @@ Your settings are protected by a password.
#(/protection)#
System version
-#[version]# (SVN #[svnRevision]#)#(versioncomment)#:: - the latest public version is #[latestVersion]#. Click here to download it.#(/versioncomment)#
+#[versionpp]# #(versioncomment)#:: - the latest public version is #[latestVersion]#. Click here to download it.#(/versioncomment)#