yacy/yacy_search_server
1
1
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-10-04 01:48:55 +03:00
Code Issues Projects Releases Wiki Activity

changed the default port from 8080 to 8090

Browse Source 
see also: http://forum.yacy-websuche.de/viewtopic.php?p=21683#p21683

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7454 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
orbiter 2011-01-28 10:54:13 +00:00
parent 6c35b68f17
commit 88773e4daa
54 changed files with 93 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addon/YaCy-Search.bat
View File

@ -1 +1 @@
rundll32 url.dll,FileProtocolHandler "http://localhost:8080"
rundll32 url.dll,FileProtocolHandler "http://localhost:8090"

2
addon/YaCy-Search.html
View File

@ -1 +1 @@
<meta http-equiv="refresh" content="0;url=http://localhost:8080/">
<meta http-equiv="refresh" content="0;url=http://localhost:8090/">

4
addon/yacy_chatscript.pl
View File

@ -40,7 +40,7 @@ if ( defined(&Xchat::print) ) {
sub setting_init() {
if ($prog eq "irssi") {
Irssi::settings_add_str("yacy_script.pl", "yacy_host", "localhost");
Irssi::settings_add_int("yacy_script.pl", "yacy_port", 8080);
Irssi::settings_add_int("yacy_script.pl", "yacy_port", 8090);
Irssi::settings_add_str("yacy_script.pl", "yacy_user", "admin");
Irssi::settings_add_str("yacy_script.pl", "yacy_pass", "");
Irssi::settings_add_int("yacy_script.pl", "yacy_statusbarupdate_interval", 60);
@ -48,7 +48,7 @@ sub setting_init() {
if ( ! -e Xchat::get_info('xchatdir')."/yacy.xml" ) {
my $data = {
host => "localhost",
port => "8080",
port => "8090",
user => "admin",
pass => ""
};

2
bin/graphicstest.sh
View File

@ -1,4 +1,4 @@
while [ 1 = 1 ]
do
curl "http://localhost:8080/NetworkPicture.png?width=768&height=576&bgcolor=FFFFFF" > /dev/null
curl "http://localhost:8090/NetworkPicture.png?width=768&height=576&bgcolor=FFFFFF" > /dev/null
done

25
defaults/yacy.init
View File

@ -10,10 +10,7 @@
# the HTTP service configurations
# port number where the server should bind to
# e.g. 8080
# #eth0:8080
# 192.168.0.1:8080
port = 8080
port = 8090
# use UPnP [true/false]
upnp.enabled = true
@ -22,8 +19,8 @@ upnp.remoteHost =
#sometimes you may want yacy to bind to another port, than the one reachable from outside.
#then set bindPort to the port yacy should bind on, and port to the port, visible from outside
#to run yacy on port 8080, reachable from port 80, set bindPort=8080, port=80 and use
#iptables -t nat -A PREROUTING -p tcp -s 192.168.24.0/16 --dport 80 -j DNAT --to 192.168.24.1:8080
#to run yacy on port 8090, reachable from port 80, set bindPort=8090, port=80 and use
#iptables -t nat -A PREROUTING -p tcp -s 192.168.24.0/16 --dport 80 -j DNAT --to 192.168.24.1:8090
#(of course you need to customize the ips)
bindPort =
@ -33,7 +30,7 @@ bindPort =
#
# English speaking user read below:
#
# With this you can access your peer using https://localhost:8080
# With this you can access your peer using https://localhost:8090
#
# There are two possibilities to specify which certificate should
# be used by YaCy.
@ -155,7 +152,7 @@ restart.time = 0
# search request these tags appear
cluster.mode=publicpeer
cluster.peers.yacydomain=localpeer.yacy
cluster.peers.ipport=localhost:8080
cluster.peers.ipport=localhost:8090
# bootstrapLoadTimeout
# this is the time-out for loading of the seedlist files during bootstraping
@ -193,7 +190,7 @@ htDefaultPath=htroot
htDocsPath = DATA/HTDOCS
# alternative path for the repository path of the web server: the URL
# http://localhost:8080/repository
# http://localhost:8090/repository
# points to DATA/HTDOCS/repository, but can be altered with this repository path
# hint: the repository path is the default path for intranet indexing. The easiest ways
# to do a indexing of the local storage system is to set a path here for the repository
@ -345,7 +342,7 @@ proxyBlueList=yacy.blue
# by default, these settings are weak to simplify set-up and testing
# every user/adiministrator shall be encouraged to change these settings
# your can change them also online during run-time on
# http://localhost:8080/
# http://localhost:8090/
# proxyClient: client-ip's that may connect the proxy for proxy service
# if several ip's are allowed then they must be separated by a ','
@ -376,7 +373,7 @@ use_proxyAccounts=false
# settings through the web interface
# should be set to a secret. By default it is without a password
# but you are encouraged to set it to another value on the page
# http://localhost:8080/ConfigAccounts_p.html
# http://localhost:8090/ConfigAccounts_p.html
#adminAccount=admin:mysecretpassword
adminAccount=
adminAccountBase64MD5=
@ -385,7 +382,7 @@ adminAccountBase64MD5=
# access from localhost may be granted with administration authority
# if this flag is set. It is set to true by default to make usage of YaCy easy
# if you use YaCy on a headless server, you should set this to false
# or configure this on http://localhost:8080/ConfigAccounts_p.html
# or configure this on http://localhost:8090/ConfigAccounts_p.html
# during the first 10 minutes of operation of YaCy;
# if the admin account password is still empty after 10 minutes a random
# password is generated an access is then ONLY from localhost, which will cause
@ -634,12 +631,12 @@ wordCacheMaxCount = 100000
# before you can use yacy as transparent proxy. On linux this
# can be done like this:
# iptables -t nat -A PREROUTING -p tcp -s 192.168.0.0/16 \
# --dport 80 -j DNAT --to 192.168.0.1:8080
# --dport 80 -j DNAT --to 192.168.0.1:8090
#
# With this iptables filter listed above all http traffic that
# comes from your private network (in this case 192.168.0.0)
# and goes to any webserver listening on port 80 will be forwarded
# by the firewall to yacy running on port 8080 (192.168.0.1:8080)
# by the firewall to yacy running on port 8090 (192.168.0.1:8090)
isTransparentProxy=false
# Specifies if yacy should use the http connection keep-alive feature

6
htroot/ConfigBasic.java
View File

@ -96,9 +96,9 @@ public class ConfigBasic {
// port settings
final long port;
if (post != null && post.containsKey("port") && Integer.parseInt(post.get("port")) > 1023) {
port = post.getLong("port", 8080);
port = post.getLong("port", 8090);
} else {
port = env.getConfigLong("port", 8080); //this allows a low port, but it will only get one, if the user edits the config himself.
port = env.getConfigLong("port", 8090); //this allows a low port, but it will only get one, if the user edits the config himself.
}
// check if peer name already exists
@ -254,7 +254,7 @@ public class ConfigBasic {
// set default values
prop.putHTML("defaultName", sb.peers.mySeed().getName());
prop.putHTML("defaultPort", env.getConfig("port", "8080"));
prop.putHTML("defaultPort", env.getConfig("port", "8090"));
lang = env.getConfig("locale.language", "default"); // re-assign lang, may have changed
if ("default".equals(lang)) {
prop.put("langDeutsch", "0");

2
htroot/ConfigLiveSearch.java
View File

@ -37,7 +37,7 @@ public class ConfigLiveSearch {
final Switchboard sb = (Switchboard) env;
prop.putHTML("ip", sb.peers.mySeed().getIP());
prop.putHTML("port", sb.getConfig("port", "8080"));
prop.putHTML("port", sb.getConfig("port", "8090"));
return prop;
}

2
htroot/ConfigPortal.java
View File

@ -115,7 +115,7 @@ public class ConfigPortal {
String myaddress = sb.peers.mySeed().getPublicAddress();
if (myaddress == null) {
myaddress = "localhost:" + sb.getConfig("port", "8080");
myaddress = "localhost:" + sb.getConfig("port", "8090");
}
prop.put("myaddress", myaddress);
return prop;

2
htroot/ConfigSearchBox.java
View File

@ -35,7 +35,7 @@ public class ConfigSearchBox {
final Switchboard sb = (Switchboard) env;
String myaddress = sb.peers.mySeed().getPublicAddress();
if (myaddress == null) myaddress = "localhost:" + sb.getConfig("port", "8080");
if (myaddress == null) myaddress = "localhost:" + sb.getConfig("port", "8090");
prop.put("myaddress", myaddress);
return prop;
}

3
htroot/CrawlStartExpert_p.java
View File

@ -38,9 +38,6 @@ public class CrawlStartExpert_p {
final serverObjects prop = new serverObjects();
// define visible variables
//String a = sb.peers.mySeed().getPublicAddress();
//boolean intranet = sb.getConfig(SwitchboardConstants.NETWORK_NAME, "").equals("intranet");
//String repository = "http://" + ((a == null) ? "localhost:" + sb.getConfig("port", "8080") : a) + "/repository/";
prop.put("starturl", /*(intranet) ? repository :*/ "http://");
prop.put("proxyPrefetchDepth", env.getConfig("proxyPrefetchDepth", "0"));
prop.put("crawlingDepth", Math.min(3, env.getConfigLong("crawlingDepth", 0)));

4
htroot/CrawlStartScanner_p.java
View File

@ -146,7 +146,7 @@ public class CrawlStartScanner_p {
if (url != null) {
String path = "/Crawler_p.html?createBookmark=off&xsstopw=off&crawlingDomMaxPages=10000&intention=&range=domain&indexMedia=on&recrawl=nodoubles&xdstopw=off&storeHTCache=on&sitemapURL=&repeat_time=7&crawlingQ=on&cachePolicy=iffresh&indexText=on&crawlingMode=url&mustnotmatch=&crawlingDomFilterDepth=1&crawlingDomFilterCheck=off&crawlingstart=Start%20New%20Crawl&xpstopw=off&repeat_unit=seldays&crawlingDepth=99";
path += "&crawlingURL=" + url.toNormalform(true, false);
WorkTables.execAPICall("localhost", (int) sb.getConfigLong("port", 8080), sb.getConfig("adminAccountBase64MD5", ""), path, pk);
WorkTables.execAPICall("localhost", (int) sb.getConfigLong("port", 8090), sb.getConfig("adminAccountBase64MD5", ""), path, pk);
}
}
}
@ -180,7 +180,7 @@ public class CrawlStartScanner_p {
if (host.getValue() == Access.granted && Scanner.inIndex(apiCommentCache, urlString) == null) {
String path = "/Crawler_p.html?createBookmark=off&xsstopw=off&crawlingDomMaxPages=10000&intention=&range=domain&indexMedia=on&recrawl=nodoubles&xdstopw=off&storeHTCache=on&sitemapURL=&repeat_time=7&crawlingQ=on&cachePolicy=iffresh&indexText=on&crawlingMode=url&mustnotmatch=&crawlingDomFilterDepth=1&crawlingDomFilterCheck=off&crawlingstart=Start%20New%20Crawl&xpstopw=off&repeat_unit=seldays&crawlingDepth=99";
path += "&crawlingURL=" + urlString;
WorkTables.execAPICall("localhost", (int) sb.getConfigLong("port", 8080), sb.getConfig("adminAccountBase64MD5", ""), path, u.hash());
WorkTables.execAPICall("localhost", (int) sb.getConfigLong("port", 8090), sb.getConfig("adminAccountBase64MD5", ""), path, u.hash());
}
i++;
} catch (MalformedURLException e) {

2
htroot/Load_MediawikiWiki.java
View File

@ -39,7 +39,7 @@ public class Load_MediawikiWiki {
// define visible variables
String a = sb.peers.mySeed().getPublicAddress();
if (a == null) a = "localhost:" + sb.getConfig("port", "8080");
if (a == null) a = "localhost:" + sb.getConfig("port", "8090");
boolean intranet = sb.getConfig(SwitchboardConstants.NETWORK_NAME, "").equals("intranet");
String repository = "http://" + a + "/repository/";
prop.put("starturl", (intranet) ? repository : "http://");

2
htroot/Load_PHPBB3.java
View File

@ -39,7 +39,7 @@ public class Load_PHPBB3 {
// define visible variables
String a = sb.peers.mySeed().getPublicAddress();
if (a == null) a = "localhost:" + sb.getConfig("port", "8080");
if (a == null) a = "localhost:" + sb.getConfig("port", "8090");
boolean intranet = sb.getConfig(SwitchboardConstants.NETWORK_NAME, "").equals("intranet");
String repository = "http://" + a + "/repository/";
prop.put("starturl", (intranet) ? repository : "http://");

2
htroot/Network.html
View File

@ -371,7 +371,7 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
<table>
<tr>
<td>ip:port</td>
<td><input id="otherPeerAddress" type="text" size="32" maxlength="128" value=":8080" /></td>
<td><input id="otherPeerAddress" type="text" size="32" maxlength="128" value=":8090" /></td>
</tr>
<tr>
<td>&nbsp;</td>

2
htroot/ProxyIndexingMonitor_p.html
View File

@ -19,7 +19,7 @@
<table border="0" cellpadding="5" cellspacing="1">
<tr class="TableCellDark">
<td colspan="3"><strong>Proxy Auto Config:</strong>
this controls the proxy auto configuration script for browsers at http://localhost:8080/autoconfig.pac
this controls the proxy auto configuration script for browsers at http://localhost:8090/autoconfig.pac
</td>
</tr>
<tr valign="top" class="TableCellLight">

2
htroot/QuickCrawlLink_p.java
View File

@ -51,7 +51,7 @@ public class QuickCrawlLink_p {
/**
* Example Javascript to call this servlet:
* <code>javascript:w = window.open('http://user:pwd@localhost:8080/QuickCrawlLink_p.html?indexText=on&indexMedia=on&crawlingQ=on&xdstopw=on&title=' + escape(document.title) + '&url=' + location.href,'_blank','height=150,width=500,resizable=yes,scrollbar=no,directory=no,menubar=no,location=no'); w.focus();</code>
* <code>javascript:w = window.open('http://user:pwd@localhost:8090/QuickCrawlLink_p.html?indexText=on&indexMedia=on&crawlingQ=on&xdstopw=on&title=' + escape(document.title) + '&url=' + location.href,'_blank','height=150,width=500,resizable=yes,scrollbar=no,directory=no,menubar=no,location=no'); w.focus();</code>
* @param header the complete HTTP header of the request
* @param post any arguments for this servlet, the request carried with (GET as well as POST)
* @param env the serverSwitch object holding all runtime-data

8
htroot/Settings_ProxyAccess.inc
View File

@ -11,10 +11,10 @@
You have four possibilities to specify the address:
</p>
<ul>
<li>defining a port only (<em>e.g. 8080</em>)</li>
<li>defining IP address and port (<em>e.g. 192.168.0.1:8080</em>)</li>
<li>defining host name and port (<em>e.g. home:8080</em>)</li>
<li>defining interface name and port (<em>e.g. #eth0:8080</em>)</li>
<li>defining a port only (<em>e.g. 8090</em>)</li>
<li>defining IP address and port (<em>e.g. 192.168.0.1:8090</em>)</li>
<li>defining host name and port (<em>e.g. home:8090</em>)</li>
<li>defining interface name and port (<em>e.g. #eth0:8090</em>)</li>
</ul>
<p><em>Hint: Dont forget to change your firewall configuration after you have changed the port.</em></p>
<table border="0" cellspacing="5">

2
htroot/Settings_p.java
View File

@ -76,7 +76,7 @@ public final class Settings_p {
prop.put("settingsTables", "");
}
prop.put("port", env.getConfig("port", "8080"));
prop.put("port", env.getConfig("port", "8090"));
prop.putHTML("peerName", sb.peers.mySeed().getName());
prop.putHTML("staticIP", env.getConfig("staticIP", ""));

2
htroot/Status.html
View File

@ -83,7 +83,7 @@
A possible reason is that you are behind a firewall, NAT or Router.
But you can <a href="index.html">search the internet</a> using the other peers'
global index on your own search page.
We encourage you to open your firewall for the port you configured (usually: 8080),
We encourage you to open your firewall for the port you configured (usually: 8090),
or to set up a 'virtual server' in your router settings (often called DMZ).
Please be fair, contribute your own index to the global index.
</dd>

2
htroot/Status.java
View File

@ -177,7 +177,7 @@ public class Status {
}
// hostname and port
final String extendedPortString = sb.getConfig("port", "8080");
final String extendedPortString = sb.getConfig("port", "8090");
final int pos = extendedPortString.indexOf(":");
prop.put("port",serverCore.getPortNr(extendedPortString));
if (pos != -1) {

4
htroot/Table_API_p.java
View File

@ -144,7 +144,7 @@ public class Table_API_p {
}
// now call the api URLs and store the result status
Map<String, Integer> l = sb.tables.execAPICalls("localhost", (int) sb.getConfigLong("port", 8080), sb.getConfig("adminAccountBase64MD5", ""), pks);
Map<String, Integer> l = sb.tables.execAPICalls("localhost", (int) sb.getConfigLong("port", 8090), sb.getConfig("adminAccountBase64MD5", ""), pks);
// construct result table
prop.put("showexec", l.size() > 0 ? 1 : 0);
@ -217,7 +217,7 @@ public class Table_API_p {
prop.put("showtable_list_" + count + "_repeatTime", time);
prop.put("showtable_list_" + count + "_type", row.get(WorkTables.TABLE_API_COL_TYPE));
prop.put("showtable_list_" + count + "_comment", row.get(WorkTables.TABLE_API_COL_COMMENT));
prop.putHTML("showtable_list_" + count + "_inline_url", "http://" + sb.myPublicIP() + ":" + sb.getConfig("port", "8080") + new String(row.get(WorkTables.TABLE_API_COL_URL)));
prop.putHTML("showtable_list_" + count + "_inline_url", "http://" + sb.myPublicIP() + ":" + sb.getConfig("port", "8090") + new String(row.get(WorkTables.TABLE_API_COL_URL)));
if (time == 0) {
prop.put("showtable_list_" + count + "_scheduler", 0);

2
htroot/mediawiki_p.java
View File

@ -36,7 +36,7 @@ import de.anomic.server.serverSwitch;
public class mediawiki_p {
//http://localhost:8080/mediawiki_p.html?dump=wikipedia.de.xml&title=Kartoffel
//http://localhost:8090/mediawiki_p.html?dump=wikipedia.de.xml&title=Kartoffel
public static serverObjects respond(final RequestHeader header, serverObjects post, final serverSwitch env) throws IOException {
final Switchboard sb = (Switchboard) env;
final serverObjects prop = new serverObjects();

2
htroot/opensearchdescription.java
View File

@ -40,7 +40,7 @@ public class opensearchdescription {
if (env.getConfigBool(SwitchboardConstants.GREETING_NETWORK_NAME, false)) promoteSearchPageGreeting = env.getConfig("network.unit.description", "");
String thisaddress = header.get("Host", "localhost");
if (thisaddress.indexOf(':') == -1) thisaddress += ":" + serverCore.getPortNr(env.getConfig("port", "8080"));
if (thisaddress.indexOf(':') == -1) thisaddress += ":" + serverCore.getPortNr(env.getConfig("port", "8090"));
int compareyacy = 0;
if (post != null && post.get("compare_yacy", "false").equals("true"))

2
htroot/processing/domaingraph/applet/domaingraph.java
View File

@ -56,7 +56,7 @@ public void setup() {
} catch (NullPointerException e) {}
if (url == null) {
host="localhost";
port=8080;
port=8090;
} else {
host=url.getHost();
port=url.getPort();

2
htroot/processing/domaingraph/applet/domaingraph.pde
View File

@ -56,7 +56,7 @@ void setup() {
} catch (NullPointerException e) {}
if (url == null) {
host="localhost";
port=8080;
port=8090;
} else {
host=url.getHost();
port=url.getPort();

2
htroot/processing/domaingraph/domaingraph.pde
View File

@ -56,7 +56,7 @@ void setup() {
} catch (NullPointerException e) {}
if (url == null) {
host="localhost";
port=8080;
port=8090;
} else {
host=url.getHost();
port=url.getPort();

2
htroot/rssTerminal.html
View File

@ -41,7 +41,7 @@ var requestCount = 0;
function fillLines() {
alert(maxlines);
for (var i = 0; i < maxlines + 1; i++) {
alert(maxlines);http://localhost:8080/Steering.html?shutdown=
alert(maxlines);http://localhost:8090/Steering.html?shutdown=
addLine(i + "-123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789-");
//addLine("");
}

2
htroot/sharedBlacklist_p.java
View File

@ -122,7 +122,7 @@ public class sharedBlacklist_p {
final yacySeed seed = sb.peers.getConnected(Hash);
if (seed != null) {
final String IP = seed.getIP();
final String Port = seed.get(yacySeed.PORT, "8080");
final String Port = seed.get(yacySeed.PORT, "8090");
final String peerName = seed.get(yacySeed.NAME, "<" + IP + ":" + Port + ">");
prop.putHTML("page_source", peerName);
downloadURLOld = "http://" + IP + ":" + Port + "/yacy/list.html?col=black";

2
htroot/test.java
View File

@ -10,7 +10,7 @@ import de.anomic.server.serverSwitch;
public class test {
// http://localhost:8080/test.xml?count=10
// http://localhost:8090/test.xml?count=10
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
final serverObjects prop = new serverObjects();

2
htroot/www/welcome.java
View File

@ -55,7 +55,7 @@ public class welcome {
prop.putHTML("peeraddress", sb.peers.mySeed().getPublicAddress());
prop.put("hostname", env.myPublicIP());
prop.put("hostip", Domains.dnsResolve(env.myPublicIP()).getHostAddress());
prop.put("port", serverCore.getPortNr(env.getConfig("port","8080")));
prop.put("port", serverCore.getPortNr(env.getConfig("port","8090")));
prop.put("clientip", header.get(HeaderFramework.CONNECTION_PROP_CLIENTIP, ""));
final String peertype = (sb.peers.mySeed() == null) ? yacySeed.PEERTYPE_JUNIOR : sb.peers.mySeed().get(yacySeed.PEERTYPE, yacySeed.PEERTYPE_VIRGIN);

4
htroot/yacy/hello.java
View File

@ -52,8 +52,8 @@ import de.anomic.yacy.dht.PeerSelection;
public final class hello {
// example:
// http://localhost:8080/yacy/hello.html?count=1&seed=p|{Hash=sCJ6Tq8T0N9x,IPType=&empty;,Port=8080,IP=,Uptime=8,rI=190,Version=0.10004882,PeerType=junior,UTC=+0200,RCount=0,sI=0,LastSeen=20080605103333,Name=intratest,CCount=5.0,SCount=40,news=,USpeed=0,CRTCnt=0,CRWCnt=0,BDate=20080605081349,rU=190,LCount=187,dct=1212668923654,ICount=2,sU=0,ISpeed=0,RSpeed=0.0,NCount=0,Flags=oooo}
// http://localhost:8080/yacy/hello.html?count=10&seed=z|H4sIAAAAAAAAADWQW2vDMAyF_81eJork3GyGX-YxGigly2WFvZTQijbQJsHx1pWx_z7nMj1J4ug7B_2s6-GsP5q3G-G6vBz2e0iz8t6zfuBr7-5PUNanQfulhqyzTkuUCFXvmitrBJtq4ed3tkPTtRpXhIiRDAmq0uhHFIiQMduJ-NXYU9NCbrrP1vnjIdUqgk09uIK51V6rMBRIilAo2NajwzfhGcx8QUKsEIp5iCJo-eaTVUXPfPQ4k5dm4pp8NzaESsLzS-14QVNIMlA-ka2m1JuZJJWIBRwPo0GIIiYp4zCSkC5GQSLiJIah0p6X_rvlS-MTbWdhkCSBIni9jA_rfP3-Ae1Oye9dAQAA
// http://localhost:8090/yacy/hello.html?count=1&seed=p|{Hash=sCJ6Tq8T0N9x,IPType=&empty;,Port=8090,IP=,Uptime=8,rI=190,Version=0.10004882,PeerType=junior,UTC=+0200,RCount=0,sI=0,LastSeen=20080605103333,Name=intratest,CCount=5.0,SCount=40,news=,USpeed=0,CRTCnt=0,CRWCnt=0,BDate=20080605081349,rU=190,LCount=187,dct=1212668923654,ICount=2,sU=0,ISpeed=0,RSpeed=0.0,NCount=0,Flags=oooo}
// http://localhost:8090/yacy/hello.html?count=10&seed=z|H4sIAAAAAAAAADWQW2vDMAyF_81eJork3GyGX-YxGigly2WFvZTQijbQJsHx1pWx_z7nMj1J4ug7B_2s6-GsP5q3G-G6vBz2e0iz8t6zfuBr7-5PUNanQfulhqyzTkuUCFXvmitrBJtq4ed3tkPTtRpXhIiRDAmq0uhHFIiQMduJ-NXYU9NCbrrP1vnjIdUqgk09uIK51V6rMBRIilAo2NajwzfhGcx8QUKsEIp5iCJo-eaTVUXPfPQ4k5dm4pp8NzaESsLzS-14QVNIMlA-ka2m1JuZJJWIBRwPo0GIIiYp4zCSkC5GQSLiJIah0p6X_rvlS-MTbWdhkCSBIni9jA_rfP3-Ae1Oye9dAQAA
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) throws InterruptedException {
final Switchboard sb = (Switchboard) env;
final serverObjects prop = new serverObjects();

2
htroot/yacy/query.java
View File

@ -43,7 +43,7 @@ import de.anomic.yacy.yacyNetwork;
public final class query {
// example:
// http://localhost:8080/yacy/query.html?youare=sCJ6Tq8T0N9x&object=lurlcount
// http://localhost:8090/yacy/query.html?youare=sCJ6Tq8T0N9x&object=lurlcount
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch ss) {
if (post == null || ss == null) { return null; }

14
htroot/yacy/search.java
View File

@ -126,13 +126,13 @@ public final class search {
// Date remoteTime = yacyCore.parseUniversalDate((String) post.get(yacySeed.MYTIME)); // read remote time
// test:
// http://localhost:8080/yacy/search.html?query=4galTpdpDM5Q (search for linux)
// http://localhost:8080/yacy/search.html?query=gh8DKIhGKXws (search for book)
// http://localhost:8080/yacy/search.html?query=UEhMGfGv2vOE (search for kernel)
// http://localhost:8080/yacy/search.html?query=ZX-LjaYo74PP (search for help)
// http://localhost:8080/yacy/search.html?query=uDqIalxDfM2a (search for mail)
// http://localhost:8080/yacy/search.html?query=4galTpdpDM5Qgh8DKIhGKXws&abstracts=auto (search for linux and book, generate abstract automatically)
// http://localhost:8080/yacy/search.html?query=&abstracts=4galTpdpDM5Q (only abstracts for linux)
// http://localhost:8090/yacy/search.html?query=4galTpdpDM5Q (search for linux)
// http://localhost:8090/yacy/search.html?query=gh8DKIhGKXws (search for book)
// http://localhost:8090/yacy/search.html?query=UEhMGfGv2vOE (search for kernel)
// http://localhost:8090/yacy/search.html?query=ZX-LjaYo74PP (search for help)
// http://localhost:8090/yacy/search.html?query=uDqIalxDfM2a (search for mail)
// http://localhost:8090/yacy/search.html?query=4galTpdpDM5Qgh8DKIhGKXws&abstracts=auto (search for linux and book, generate abstract automatically)
// http://localhost:8090/yacy/search.html?query=&abstracts=4galTpdpDM5Q (only abstracts for linux)
if ((sb.isRobinsonMode()) &&
(!((sb.isPublicRobinson()) ||

2
htroot/yacysearch.java
View File

@ -693,7 +693,7 @@ public class yacysearch {
// adding some additional properties needed for the rss feed
String hostName = header.get("Host", "localhost");
if (hostName.indexOf(':') == -1) hostName += ":" + serverCore.getPortNr(env.getConfig("port", "8080"));
if (hostName.indexOf(':') == -1) hostName += ":" + serverCore.getPortNr(env.getConfig("port", "8090"));
prop.put("searchBaseURL", "http://" + hostName + "/yacysearch.html");
prop.put("rssYacyImageURL", "http://" + hostName + "/env/grafics/yacy.gif");
}

6
htroot/yacysearch_location.java
View File

@ -64,7 +64,7 @@ public class yacysearch_location {
boolean search_subject = search_mdall || post.get("dom", "").indexOf("subject") >= 0;
long maximumTime = post.getLong("maximumTime", 3000);
int maximumRecords = post.getInt("maximumRecords", 200);
//i.e. http://localhost:8080/yacysearch_location.kml?query=berlin&maximumTime=2000&maximumRecords=100
//i.e. http://localhost:8090/yacysearch_location.kml?query=berlin&maximumTime=2000&maximumRecords=100
int placemarkCounter = 0;
if (search_query) {
@ -91,7 +91,7 @@ public class yacysearch_location {
if (search_title || search_publisher || search_creator || search_subject) try {
// get a queue of search results
String rssSearchServiceURL = "http://localhost:" + sb.getConfig("port", "8080") + "/yacysearch.rss";
String rssSearchServiceURL = "http://localhost:" + sb.getConfig("port", "8090") + "/yacysearch.rss";
BlockingQueue<RSSMessage> results = new LinkedBlockingQueue<RSSMessage>();
SearchSRURSS.searchSRURSS(results, rssSearchServiceURL, query, maximumTime, Integer.MAX_VALUE, false, false, null);
@ -137,7 +137,7 @@ public class yacysearch_location {
String promoteSearchPageGreeting = env.getConfig(SwitchboardConstants.GREETING, "");
if (env.getConfigBool(SwitchboardConstants.GREETING_NETWORK_NAME, false)) promoteSearchPageGreeting = env.getConfig("network.unit.description", "");
String hostName = header.get("Host", "localhost");
if (hostName.indexOf(':') == -1) hostName += ":" + serverCore.getPortNr(env.getConfig("port", "8080"));
if (hostName.indexOf(':') == -1) hostName += ":" + serverCore.getPortNr(env.getConfig("port", "8090"));
final String originalquerystring = (post == null) ? "" : post.get("query", post.get("search", "")).trim(); // SRU compliance
final boolean global = post.get("kml_resource", "local").equals("global");

6
readme.txt
View File

@ -71,7 +71,7 @@ HOW DO I USE THIS SOFTWARE, WHERE IS THE ADMINISTRATION INTERFACE?
YaCy is a server process that can be administrated and used
with your web browser: open
http://localhost:8080
http://localhost:8090
There you can see your personal search and administration interface.
@ -79,12 +79,12 @@ There you can see your personal search and administration interface.
ANY MORE CONFIGURATIONS?
- after startup, you see the configuration page in your web browser.
just open http://localhost:8080
just open http://localhost:8090
all you have to do (should do) is to enter a password for your peer
- You can use YaCy as your web proxy.
This is an option, you don't need to do that.
Simply configure your internet connection to use a proxy at port 8080.
Simply configure your internet connection to use a proxy at port 8090.

4
source/de/anomic/data/WorkTables.java
View File

@ -105,7 +105,7 @@ public class WorkTables extends Tables {
byte[] pk = pks == null ? null : pks.getBytes();
// generate the apicall url - without the apicall attributes
final String apiurl = /*"http://localhost:" + getConfig("port", "8080") +*/ "/" + servletName + "?" + post.toString();
final String apiurl = /*"http://localhost:" + getConfig("port", "8090") +*/ "/" + servletName + "?" + post.toString();
// read old entry from the apicall table (if exists)
Row row = null;
@ -177,7 +177,7 @@ public class WorkTables extends Tables {
}
// generate the apicall url - without the apicall attributes
final String apiurl = /*"http://localhost:" + getConfig("port", "8080") +*/ "/" + servletName + "?" + post.toString();
final String apiurl = /*"http://localhost:" + getConfig("port", "8090") +*/ "/" + servletName + "?" + post.toString();
byte[] pk = null;
// insert entry
try {

2
source/de/anomic/http/server/HTTPDFileHandler.java
View File

@ -622,7 +622,7 @@ public final class HTTPDFileHandler {
if (httpVersion != null) {
env.put("SERVER_PROTOCOL", httpVersion);
}
env.put("SERVER_PORT", switchboard.getConfig("port", "8080"));
env.put("SERVER_PORT", switchboard.getConfig("port", "8090"));
env.put("REQUEST_METHOD", method);
// env.put("PATH_INFO", ""); // TODO: implement
// env.put("PATH_TRANSLATED", ""); // TODO: implement

8
source/de/anomic/http/server/HTTPDemon.java
View File

@ -1082,13 +1082,13 @@ public final class HTTPDemon implements serverHandler, Cloneable {
final InetAddress hostAddress = Domains.dnsResolve(clientIP);
if (hostAddress == null) {
tp.put("host", Domains.myPublicLocalIP().getHostAddress());
tp.put("port", serverCore.getPortNr(switchboard.getConfig("port", "8080")));
tp.put("port", serverCore.getPortNr(switchboard.getConfig("port", "8090")));
} else if (hostAddress.isSiteLocalAddress() || hostAddress.isLoopbackAddress()) {
tp.put("host", Domains.myPublicLocalIP().getHostAddress());
tp.put("port", serverCore.getPortNr(switchboard.getConfig("port", "8080")));
tp.put("port", serverCore.getPortNr(switchboard.getConfig("port", "8090")));
} else {
tp.put("host", switchboard.myPublicIP());
tp.put("port", Integer.toString(serverCore.getPortNr(switchboard.getConfig("port", "8080"))));
tp.put("port", Integer.toString(serverCore.getPortNr(switchboard.getConfig("port", "8090"))));
}
tp.put("peerName", (getAlternativeResolver() == null) ? "" : getAlternativeResolver().myName());
@ -1384,7 +1384,7 @@ public final class HTTPDemon implements serverHandler, Cloneable {
*/
} else if (
// check if the destination port is equal to the port yacy is listening to
dstPort.equals(Integer.valueOf(serverCore.getPortNr(switchboard.getConfig("port", "8080")))) &&
dstPort.equals(Integer.valueOf(serverCore.getPortNr(switchboard.getConfig("port", "8090")))) &&
(
// check if the destination host is our local IP address
Domains.isThisHostIP(dstHost) ||

4
source/de/anomic/search/Switchboard.java
View File

@ -1522,7 +1522,7 @@ public final class Switchboard extends serverSwitch {
Log.logException(e);
continue;
}
Map<String, Integer> callResult = this.tables.execAPICalls("localhost", (int) this.getConfigLong("port", 8080), this.getConfig("adminAccountBase64MD5", ""), pks);
Map<String, Integer> callResult = this.tables.execAPICalls("localhost", (int) this.getConfigLong("port", 8090), this.getConfig("adminAccountBase64MD5", ""), pks);
for (Map.Entry<String, Integer> call: callResult.entrySet()) {
log.logInfo("Scheduler executed api call, response " + call.getValue() + ": " + call.getKey());
}
@ -2411,7 +2411,7 @@ public final class Switchboard extends serverSwitch {
}
public void updateMySeed() {
peers.mySeed().put(yacySeed.PORT, Integer.toString(serverCore.getPortNr(getConfig("port", "8080"))));
peers.mySeed().put(yacySeed.PORT, Integer.toString(serverCore.getPortNr(getConfig("port", "8090"))));
//the speed of indexing (pages/minute) of the peer
final long uptime = (System.currentTimeMillis() - serverCore.startupTime) / 1000;

2
source/de/anomic/server/serverCore.java
View File

@ -215,7 +215,7 @@ public final class serverCore extends AbstractBusyThread implements BusyThread {
this.log.logInfo("Initializing serverCore ...");
// read some config values
this.extendedPort = this.switchboard.getConfig("port", "8080").trim();
this.extendedPort = this.switchboard.getConfig("port", "8090").trim();
this.bindPort = this.switchboard.getConfig("bindPort", "").trim();
// Open a new server-socket channel

2
source/de/anomic/yacy/Tray.java
View File

@ -159,7 +159,7 @@ public final class Tray {
protected static void openBrowser(final String browserPopUpPage){
if(isIntegrated) return;
// no need for https, because we are on localhost
Browser.openBrowser("http://localhost:" + sb.getConfig("port", "8080") + "/" + browserPopUpPage);
Browser.openBrowser("http://localhost:" + sb.getConfig("port", "8090") + "/" + browserPopUpPage);
}
public static void removeTray(){

2
source/de/anomic/yacy/yacyChannel.java
View File

@ -40,7 +40,7 @@ public enum yacyChannel {
// test:
// http://localhost:8080/xml/feed.rss?set=PEERNEWS,REMOTESEARCH,LOCALSEARCH,REMOTEINDEXING,LOCALINDEXING
// http://localhost:8090/xml/feed.rss?set=PEERNEWS,REMOTESEARCH,LOCALSEARCH,REMOTEINDEXING,LOCALINDEXING
/**
* the following private channels are declared to prevent that an access to the feed servlet

8
source/de/anomic/yacy/yacyClient.java
View File

@ -370,7 +370,7 @@ public final class yacyClient {
}
public static RSSFeed search(final yacySeed targetSeed, String query, boolean verify, boolean global, long timeout, int startRecord, int maximumRecords) throws IOException {
String address = (targetSeed == null || targetSeed == Switchboard.getSwitchboard().peers.mySeed()) ? "localhost:" + Switchboard.getSwitchboard().getConfig("port", "8080") : targetSeed.getClusterAddress();
String address = (targetSeed == null || targetSeed == Switchboard.getSwitchboard().peers.mySeed()) ? "localhost:" + Switchboard.getSwitchboard().getConfig("port", "8090") : targetSeed.getClusterAddress();
String urlBase = "http://" + address + "/yacysearch.rss";
return SearchSRURSS.loadSRURSS(urlBase, query, timeout, startRecord, maximumRecords, verify, global, null);
}
@ -742,7 +742,7 @@ public final class yacyClient {
if (targetSeed == null) { return null; }
address = targetSeed.getClusterAddress();
}
if (address == null) address = "localhost:8080";
if (address == null) address = "localhost:8090";
return address;
}
@ -1007,7 +1007,7 @@ public final class yacyClient {
final String salt = crypt.randomSalt();
String address = targetSeed.getClusterAddress();
if (address == null) { address = "localhost:8080"; }
if (address == null) { address = "localhost:8090"; }
try {
final Map<String,ContentBody> parts = yacyNetwork.basicRequestParts(Switchboard.getSwitchboard(), targetSeed.hash, salt);
final byte[] content = HTTPConnector.getConnector(MultiProtocolURI.yacybotUserAgent).post(new MultiProtocolURI("http://" + address + "/yacy/profile.html"), 5000, targetSeed.getHexHash() + ".yacyh", parts);
@ -1024,7 +1024,7 @@ public final class yacyClient {
// first arg: path to application home
// second arg: address of target peer
// third arg: search word or file name with list of search words
// i.e. /Data/workspace1/yacy/ localhost:8080 /Data/workspace1/yacy/test/words/searchtest.words
// i.e. /Data/workspace1/yacy/ localhost:8090 /Data/workspace1/yacy/test/words/searchtest.words
System.out.println("yacyClient Test");
File searchwordfile = new File(args[2]);
List<String> searchlines = new ArrayList<String>();

2
source/de/anomic/yacy/yacySeed.java
View File

@ -718,7 +718,7 @@ public class yacySeed implements Cloneable {
// now calculate other information about the host
newSeed.dna.put(yacySeed.NAME, (name) == null ? defaultPeerName() : name);
newSeed.dna.put(yacySeed.PORT, Integer.toString((port <= 0) ? 8080 : port));
newSeed.dna.put(yacySeed.PORT, Integer.toString((port <= 0) ? 8090 : port));
newSeed.dna.put(yacySeed.BDATE, GenericFormatter.SHORT_SECOND_FORMATTER.format(new Date(System.currentTimeMillis() /*- DateFormatter.UTCDiff()*/)) );
newSeed.dna.put(yacySeed.LASTSEEN, newSeed.dna.get(yacySeed.BDATE)); // just as initial setting
newSeed.dna.put(yacySeed.UTC, GenericFormatter.UTCDiffString());

2
source/de/anomic/yacy/yacySeedDB.java
View File

@ -950,7 +950,7 @@ public final class yacySeedDB implements AlternativeDomainNames {
if (this.mySeed == null) initMySeed();
if ((seed == mySeed) && (!(seed.isOnline()))) {
// take local ip instead of external
return Switchboard.getSwitchboard().myPublicIP() + ":8080" + ((subdom == null) ? "" : ("/" + subdom));
return Switchboard.getSwitchboard().myPublicIP() + ":" + Switchboard.getSwitchboard().getConfig("port", "8090") + ((subdom == null) ? "" : ("/" + subdom));
}
return seed.getPublicAddress() + ((subdom == null) ? "" : ("/" + subdom));
} else {

2
source/net/yacy/YaCySearchClient.java
View File

@ -109,7 +109,7 @@ public class YaCySearchClient {
public static void main(String[] args) {
for (String query: args) try {
long t = System.currentTimeMillis();
YaCySearchClient search = new YaCySearchClient("localhost", 8080, query);
YaCySearchClient search = new YaCySearchClient("localhost", 8090, query);
System.out.println("Search result for '" + query + "':");
System.out.print(search.next().toString()); // get 10 results; you may repeat this for next 10
System.out.println("Search Time: " + (System.currentTimeMillis() - t) + " milliseconds\n");

2
source/net/yacy/document/parser/html/TransformerWriter.java
View File

@ -581,7 +581,7 @@ public final class TransformerWriter extends Writer {
System.exit(0);
final char[] buffer = new char[512];
try {
final ContentScraper scraper = new ContentScraper(new DigestURI("http://localhost:8080"));
final ContentScraper scraper = new ContentScraper(new DigestURI("http://localhost:8090"));
final Transformer transformer = new ContentTransformer();
final Reader is = new FileReader(args[0]);
final FileOutputStream fos = new FileOutputStream(new File(args[0] + ".out"));

2
source/net/yacy/gui/InfoPage.java
View File

@ -113,7 +113,7 @@ public class InfoPage implements Layout {
String infotext =
"This is a very early test for a YaCy GUI.\n\n" +
"The YaCy administration interface is in your browser\n" +
"just open http://localhost:8080\n\n" +
"just open http://localhost:8090\n\n" +
"You may also enter a search term and press enter,\n" +
"then the query will be opened in your browser\n";
if (OS.isMacArchitecture) infotext += "\nThe application data on Mac is stored at ~Library/YaCy/\n";

4
source/net/yacy/gui/YaCyApp.java
View File

@ -132,7 +132,7 @@ public class YaCyApp {
log.info("Registering Shutdown Hook");
Thread t = new Thread() {
public void run() {
app = new Application("YaCy GUI", operation, menues, new InfoPage("localhost", 8080));
app = new Application("YaCy GUI", operation, menues, new InfoPage("localhost", 8090));
app.setLocationRelativeTo(null);
app.setVisible(true);
}
@ -144,7 +144,7 @@ public class YaCyApp {
public static void main(String[] args) {
if (args.length > 0) Switchboard.load(new File(args[0]));
start("localhost", 8080);
start("localhost", 8090);
}

6
source/net/yacy/yacy.java
View File

@ -220,7 +220,7 @@ public final class yacy {
sb.setConfig("memoryTotalAfterStartup", startupMemTotal);
// start gui if wanted
if (gui) YaCyApp.start("localhost", (int) sb.getConfigLong("port", 8080));
if (gui) YaCyApp.start("localhost", (int) sb.getConfigLong("port", 8090));
// hardcoded, forced, temporary value-migration
sb.setConfig("htTemplatePath", "htroot/env/templates");
@ -294,7 +294,7 @@ public final class yacy {
HTTPClient.setDefaultUserAgent(userAgent);
// start main threads
final String port = sb.getConfig("port", "8080");
final String port = sb.getConfig("port", "8090");
try {
final HTTPDemon protocolHandler = new HTTPDemon(sb);
final serverCore server = new serverCore(
@ -529,7 +529,7 @@ public final class yacy {
final Properties config = configuration("COMMAND-STEERING", homePath);
// read port
final int port = serverCore.getPortNr(config.getProperty("port", "8080"));
final int port = serverCore.getPortNr(config.getProperty("port", "8090"));
// read password
String encodedPassword = (String) config.get(HTTPDemon.ADMIN_ACCOUNT_B64MD5);

2
startYACY.command
View File

@ -7,5 +7,5 @@ echo "** LOG of YaCy: DATA/LOG/yacy00.log (and yacy<xx>.log)
echo "** STOP YaCy: execute stopYACY.sh and wait some seconds **"
echo "** GET HELP for YaCy: see http://wiki.yacy.net and http://forum.yacy.de **"
echo "*******************************************************************************"
echo " >> YaCy started as daemon process. Administration at http://localhost:8080 <<"
echo " >> YaCy started as daemon process. Administration at http://localhost:8090 <<"
echo " You can close this window now, this will NOT shut down your YaCy peer."

2
startYACY.sh
View File

@ -166,7 +166,7 @@ then
# done
else
JAVA_ARGS="-Xmx600m -Xms180m $JAVA_ARGS";
PORT="8080"
PORT="8090"
fi
#echo "JAVA_ARGS: $JAVA_ARGS"

2
startYACY_debug.bat
View File

@ -15,7 +15,7 @@ set jms=
set javacmd=-Xmx600m -Xms180m
set priolvl=10
set priority=/BELOWNORMAL
set port=8080
set port=8090
if exist DATA\SETTINGS\httpProxy.conf GoTo :RENAMEINDEX
if exist DATA\SETTINGS\yacy.conf GoTo :GETSTARTOPTS