diff --git a/htroot/IndexControl_p.html b/htroot/IndexControl_p.html index 4b15468f0..8cfa33985 100644 --- a/htroot/IndexControl_p.html +++ b/htroot/IndexControl_p.html @@ -76,7 +76,7 @@ Index Distribution: - + This enables automated, DHT-ruled Index Transmission to other peers. @@ -84,12 +84,12 @@    - + If checked, DHT-Transmission is enabled even during crawling. Index Receive: - + Accept remote Index Transmissions. This works only if you are a senior peer. The DHT-rules do not work without this function. @@ -97,7 +97,7 @@    - + If checked, your peer silently ignores transmitted URLs that match your blacklist @@ -130,7 +130,7 @@
#{urlList}# #(urlExists)# #[urlhxValue]# <unresolved URL Hash>
- :: + :: #[urlhxValue]# #[urlString]#, pos=#[pos]#
#(/urlExists)# #{/urlList}# diff --git a/htroot/IndexControl_p.java b/htroot/IndexControl_p.java index 15c24e20a..d196dd4a4 100644 --- a/htroot/IndexControl_p.java +++ b/htroot/IndexControl_p.java @@ -72,8 +72,8 @@ import de.anomic.yacy.yacyCore; import de.anomic.yacy.yacySeed; public class IndexControl_p { - - public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { + + public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { // return variable that accumulates replacements plasmaSwitchboard switchboard = (plasmaSwitchboard) env; @@ -88,10 +88,10 @@ public class IndexControl_p { prop.put("wcount", Integer.toString(switchboard.wordIndex.size())); prop.put("ucount", Integer.toString(switchboard.wordIndex.loadedURL.size())); prop.put("otherHosts", ""); - prop.put("indexDistributeChecked", (switchboard.getConfig("allowDistributeIndex", "true").equals("true")) ? "checked" : ""); - prop.put("indexDistributeWhileCrawling", (switchboard.getConfig("allowDistributeIndexWhileCrawling", "true").equals("true")) ? "checked" : ""); - prop.put("indexReceiveChecked", (switchboard.getConfig("allowReceiveIndex", "true").equals("true")) ? "checked" : ""); - prop.put("indexReceiveBlockBlacklistChecked", (switchboard.getConfig("indexReceiveBlockBlacklist", "true").equals("true")) ? "checked" : ""); + prop.put("indexDistributeChecked", (switchboard.getConfig("allowDistributeIndex", "true").equals("true")) ? 1 : 0); + prop.put("indexDistributeWhileCrawling", (switchboard.getConfig("allowDistributeIndexWhileCrawling", "true").equals("true")) ? 1 : 0); + prop.put("indexReceiveChecked", (switchboard.getConfig("allowReceiveIndex", "true").equals("true")) ? 1 : 0); + prop.put("indexReceiveBlockBlacklistChecked", (switchboard.getConfig("indexReceiveBlockBlacklist", "true").equals("true")) ? 1 : 0); prop.put("peertags", serverCodings.set2string(yacyCore.seedDB.mySeed.getPeerTags(), ",", false)); return prop; // be save } diff --git a/htroot/IndexShare_p.html b/htroot/IndexShare_p.html index 17c0e8894..2425c1754 100644 --- a/htroot/IndexShare_p.html +++ b/htroot/IndexShare_p.html @@ -19,11 +19,11 @@ Index:  - distribute 
- receive + distribute 
+ receive -    receive grant default: 
+    receive grant default:
   for each remote peer  diff --git a/htroot/IndexShare_p.java b/htroot/IndexShare_p.java index a174beb45..eb6dc95c8 100644 --- a/htroot/IndexShare_p.java +++ b/htroot/IndexShare_p.java @@ -56,9 +56,9 @@ import de.anomic.server.serverSwitch; public class IndexShare_p { public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { - // return variable that accumulates replacements + // return variable that accumulates replacements plasmaSwitchboard switchboard = (plasmaSwitchboard) env; - serverObjects prop = new serverObjects(); + serverObjects prop = new serverObjects(); if ((post == null) || (env == null)) { prop.put("linkfreq", switchboard.getConfig("defaultLinkReceiveFrequency","30")); @@ -80,8 +80,9 @@ public class IndexShare_p { // insert constants prop.put("wcount", Integer.toString(switchboard.wordIndex.size())); prop.put("ucount", Integer.toString(switchboard.wordIndex.loadedURL.size())); - // return rewrite properties - return prop; + + // return rewrite properties + return prop; } } diff --git a/htroot/ProxyIndexingMonitor_p.html b/htroot/ProxyIndexingMonitor_p.html index 6a744e34d..b89efe87b 100644 --- a/htroot/ProxyIndexingMonitor_p.html +++ b/htroot/ProxyIndexingMonitor_p.html @@ -25,8 +25,8 @@ - Prefetch Depth - + + A prefetch of 0 means no prefetch; a prefetch of 1 means to prefetch all embedded URLs, but since embedded image links are loaded by the browser @@ -34,13 +34,13 @@ - Store to Cache - + + It is almost always recommended to set this on. The only exception is that you have another caching proxy running as secondary proxy and YaCy is configured to used that proxy in proxy-proxy - mode. - Do Remote Indexing - + + If checked, the crawler will contact other peers and use them as remote indexers for your crawl. If you need your crawling results locally, you should switch this off. @@ -54,13 +54,13 @@ - Path - + + The path where the pages are stored (max. length 300) - Size - + + The size in MB of the cache. diff --git a/htroot/Settings_Http.inc b/htroot/Settings_Http.inc index 2ffc1b617..688b85fa8 100644 --- a/htroot/Settings_Http.inc +++ b/htroot/Settings_Http.inc @@ -1,32 +1,36 @@ -

+

HTTP Networking - - - + + + - - + + - - - + + + - - + + - +
Transparent Proxy:With this you can specify if YaCy can be used as transparent proxy.
- Hint: On linux you can configure your firewall to transparently redirect all http traffic through yacy using this iptables rule:
- iptables -t nat -A PREROUTING -p tcp -s 192.168.0.0/16 --dport 80 -j DNAT --to 192.168.0.1:#[port]# - 		: + With this you can specify if YaCy can be used as transparent proxy.
+ Hint: On linux you can configure your firewall to transparently redirect all http traffic through yacy using this iptables rule:
+ iptables -t nat -A PREROUTING -p tcp -s 192.168.0.0/16 --dport 80 -j DNAT --to 192.168.0.1:#[port]# +
Connection Keep-Alive:: With this you can specify if YaCy should support the HTTP connection keep-alive feature.
Send Via Header:Specifies if the proxy should send the Via http header according to RFC 2616 Sect 14.45.: + Specifies if the proxy should send the Via + http header according to RFC 2616 Sect 14.45. +
Send X-Forwarded-For Header:: Specifies if the proxy should send the X-Forwarded-For http header.
 Changes will take effect immediately. Changes will take effect immediately.
-

\ No newline at end of file +
\ No newline at end of file diff --git a/htroot/Settings_MessageForwarding.inc b/htroot/Settings_MessageForwarding.inc index db777496a..f9b458f08 100644 --- a/htroot/Settings_MessageForwarding.inc +++ b/htroot/Settings_MessageForwarding.inc @@ -1,27 +1,31 @@ -

+
Message Forwarding -

With this settings you can activate or deactivate forwarding of yacy-messages via email. -

+

With this settings you can activate or deactivate forwarding of yacy-messages via email.

- - - + + + - - - + + + - - - + + + - - - + +
Enable message forwarding:Enabling/Disabling message forwarding via email.:Enabling/Disabling message forwarding via email.
Forwarding Command:The command-line program that should be used to forward the message.
e.g.: /usr/sbin/sendmail		: + The command-line program that should be used to forward the message.
+ e.g.: /usr/sbin/sendmail +
Forwarding To:The recipient email-address.
e.g.: root@localhost		: + The recipient email-address.
+ e.g.: root@localhost +
 Changes will take effect immediately.
Changes will take effect immediately.
-

\ No newline at end of file +
\ No newline at end of file diff --git a/htroot/Settings_Parser.inc b/htroot/Settings_Parser.inc index 9c82a8b7a..5f47a2e17 100644 --- a/htroot/Settings_Parser.inc +++ b/htroot/Settings_Parser.inc @@ -1,43 +1,37 @@ -

+
Content Parser Settings -

With this settings you can activate or deactivate parsing of additional content-types based on their MIME-types.
-For a detailed description of the various MIME-types take a look at http://www.iana.org/assignments/media-types/

+ With this settings you can activate or deactivate parsing of additional content-types based on their MIME-types.
+ For a detailed description of the various MIME-types take a look at + http://www.iana.org/assignments/media-types/ +

- -#{parserMode}# - -#{/parserMode}# - - - - -#{parser}# - - - - - -#{mime}# - -#{parserMode}# - -#{/parserMode}# - - - - -#{/mime}# -#{/parser}# + #{parserMode}# + #{/parserMode}# + + + + #{parser}# -#{parserMode}# - + + + + #{mime}# + #{parserMode}# + #{/parserMode}# + + + + #{/mime}##{/parser}# + #{parserMode}# + + - +
#[name]#Mime-TypeParser Usage
#[name]# V#[version]##[usage]# 
#[mimetype]# 
#[name]#Mime-TypeParser Usage
-#{/parserMode}# - Enable all parsers#[name]# V#[version]##[usage]# 
#[mimetype]# 
+ #{/parserMode}# + Enable all parsers  
 Changes take effect immediately Changes take effect immediately
diff --git a/htroot/Settings_PortForwarding.inc b/htroot/Settings_PortForwarding.inc index 2dc3aa009..e00f3c073 100644 --- a/htroot/Settings_PortForwarding.inc +++ b/htroot/Settings_PortForwarding.inc @@ -1,63 +1,66 @@ -

+

Port Forwarding (optional) -

You can use a remote server running a ssh demon to forward your server/proxy port. -This is useful if you want to tunnel throug a NAT/router. -Alternatively, you can simply set a virtual server port on your NAT/Server to enable connections from outside.

+

+ You can use a remote server running a ssh demon to forward your server/proxy port. + This is useful if you want to tunnel throug a NAT/router. + Alternatively, you can simply set a virtual server port on your NAT/Server to enable connections from outside. +

#(portForwarding.Available)#

You need to install libx to use this feature

::#(/portForwarding.Available)# - - - + + + - - + - - - + + - - - + + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - +
Enable port forwarding:Enabling disabling port forwarding:Enabling / disabling port forwarding
Forwarding method:: + Select the port forwarding method to use.
Special settings for port forwarding using secure channel
Forwarding via proxy: - Function not available at the moment.: + + Function not available at the moment. +
Forwarding port:: The tcp/ip port on the remote server that should be forwarded via the secure channel to the local host.
Forwarding host:ip address or name of the remote server:IP address or name of the remote server.
Forwarding host port:ssh port of the remote server:SSH port of the remote server.
Forwarding host user:username to login on the remote server:Username to login on the remote server.
Forwarding host password:password to login on the remote server:Password to login on the remote server.
 Changes will take effect immediately. Changes will take effect immediately.
-

\ No newline at end of file +
\ No newline at end of file diff --git a/htroot/Settings_Proxy.inc b/htroot/Settings_Proxy.inc index 548600c36..bd954296e 100644 --- a/htroot/Settings_Proxy.inc +++ b/htroot/Settings_Proxy.inc @@ -1,64 +1,66 @@ -

+
Remote Proxy (optional)

YaCy can use another proxy to connect to the internet. You can enter the address for the remote proxy here:

-

+
- - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - +
Use remote proxy::   Enables the usage of the remote proxy by yacy
Use remote proxy for yacy <-> yacy communicationSpecifies if the remote proxy should be used for the communication of this peer to other yacy peers.
- Hint: Enabling this option could cause this peer to remain in junior status.		 + Specifies if the remote proxy should be used for the communication of this peer to other yacy peers.
+ Hint: Enabling this option could cause this peer to remain in junior status. +
Use remote proxy for https Specifies if YaCy should forward ssl connections to the remote proxy.
Remote proxy host:: The ip address or domain name of the remote proxy
Remote proxy port:: the port of the remote proxy
Remote proxy user::  
Remote proxy pwd::  
no-proxy adresses:: IP addresses for which the remote proxy should not be used
  Changes will take effect immediately. Changes will take effect immediately.

diff --git a/htroot/Settings_ProxyAccess.inc b/htroot/Settings_ProxyAccess.inc index cfc0ddf71..1e64764db 100644 --- a/htroot/Settings_ProxyAccess.inc +++ b/htroot/Settings_ProxyAccess.inc @@ -1,41 +1,59 @@ -

+

Proxy Access Settings -These settings configure the access method to your own http proxy and server. -All traffic is routed throug one single port, for both proxy and server.
-
Server/Proxy Port Configuration
-

The socket addresses where YaCy should listen for incoming connections from other YaCy peers or http clients.
-You have four possibilities to specify the address:


-Hint: Dont forget to change your firewall configuration after you have changed the port. +

+ These settings configure the access method to your own http proxy and server. + All traffic is routed throug one single port, for both proxy and server.
+
+ Server/Proxy Port Configuration +

+

+ The socket addresses where YaCy should listen for incoming connections from other YaCy peers or http clients.
+ You have four possibilities to specify the address:

+ +

Hint: Dont forget to change your firewall configuration after you have changed the port.

- - + +
Proxy and http-Server Administration Port:: Changes will take effect in 5-10 seconds
-

Server Access Restrictions

You can restrict the access to this proxy/server using a two-stage security barrier: +

+ Server Access Restrictions
+
+ You can restrict the access to this proxy/server using a two-stage security barrier: +


- -

This is the account that restricts access to the proxy function. You probably don't want to share the proxy to the internet, so you should set the IP-Number Access Domain to a pattern that corresponds to you local intranet. The default setting should be right in most cases. If you want, you can also set a proxy account so that every proxy user must authenticate first, but this is rather unusual.

+
  • define an access domain with a list of granted client IP-numbers or with wildcards
    • +
  • define an user account with an user:password - pair
    • +

    + This is the account that restricts access to the proxy function. + You probably don't want to share the proxy to the internet, so you should set the + IP-Number Access Domain to a pattern that corresponds to you local intranet. + The default setting should be right in most cases. If you want, you can also set a proxy account + so that every proxy user must authenticate first, but this is rather unusual. +

    - - + + - - + + diff --git a/htroot/Settings_Seed.inc b/htroot/Settings_Seed.inc index ee0be2978..1c23fde62 100644 --- a/htroot/Settings_Seed.inc +++ b/htroot/Settings_Seed.inc @@ -1,34 +1,41 @@ -

    Seed Upload Settings -

    With these settings you can configure if you have an account on a public accessible -server where you can host a seed-list file.

    -

    General Settings:

    -If you enable one of the available uploading methods, you will become a principal peer. -Your peer will then upload the seed-bootstrap information periodically, -but only if there have been changes to the seed-list. +

    + With these settings you can configure if you have an account on a public accessible + server where you can host a seed-list file. +

    +

    + General Settings: + If you enable one of the available uploading methods, you will become a principal peer. + Your peer will then upload the seed-bootstrap information periodically, + but only if there have been changes to the seed-list.

    IP-Number filter:: + +
    Accounts: Use Proxy Accounts: + + Use Proxy Accounts +
    - - + - + + + - - - - + + + + - - + +
    Upload Method:: - Here you can specify which upload method should be used. Select 'none' to deactivate uploading.Here you can specify which upload method should be used. Select 'none' to deactivate uploading.
    URL:The URL that can be used to retrieve the uploaded seed file, like - http://www.<my-host>.net/yacy/seed.txt'
    : + + The URL that can be used to retrieve the uploaded seed file, like + http://www.<my-host>.net/yacy/seed.txt' + +
    diff --git a/htroot/Settings_Seed_UploadFile.inc b/htroot/Settings_Seed_UploadFile.inc index 403a149d9..6350408b1 100644 --- a/htroot/Settings_Seed_UploadFile.inc +++ b/htroot/Settings_Seed_UploadFile.inc @@ -1,15 +1,15 @@ -

    -Store into filesystem:

    +
    +

    Store into filesystem:

    You must configure this if you want to store the seed-list file onto the file system.

    - - + + - +
    File Location:: Here you can specify the path within the filesystem where the seed-list file should be stored.
    diff --git a/htroot/Settings_Seed_UploadFtp.inc b/htroot/Settings_Seed_UploadFtp.inc index bbac0fb99..0d01201a7 100644 --- a/htroot/Settings_Seed_UploadFtp.inc +++ b/htroot/Settings_Seed_UploadFtp.inc @@ -1,35 +1,37 @@ -

    -Uploading via FTP:

    -

    This is the account for a FTP server where you can host a seed-list file. -If you set this, you will become a principal peer. -Your peer will then upload the seed-bootstrap information periodically, -but only if there had been changes to the seed-list. +

    +

    Uploading via FTP:

    +

    + This is the account for a FTP server where you can host a seed-list file. + If you set this, you will become a principal peer. + Your peer will then upload the seed-bootstrap information periodically, + but only if there had been changes to the seed-list.

    - - + + - - - + + + - - + + - - + + - +
    Server:: The host where you have a FTP account, like 'ftp.<my-host>.net'
    Path:The remote path on the FTP server, like 'yacy/seed.txt'. - Missing sub-directories are NOT created automatically.: + The remote path on the FTP server, like 'yacy/seed.txt'. Missing sub-directories are NOT created automatically. +
    Username:: Your log-in at the FTP server
    Password:: The password
    diff --git a/htroot/Settings_Seed_UploadScp.inc b/htroot/Settings_Seed_UploadScp.inc index 217530f28..c0945f817 100644 --- a/htroot/Settings_Seed_UploadScp.inc +++ b/htroot/Settings_Seed_UploadScp.inc @@ -1,36 +1,37 @@ -

    -Uploading via SCP:

    +
    +

    Uploading via SCP:

    This is the account for a server where you are able to login via ssh.

    - - + + - - + + - - - + + + - - + + - - + + - +
    Server:: The host where you have an account, like 'my.host.net'
    Server Port:: The sshd port of the host, like '22'
    Path:The remote path on the server, like '~/yacy/seed.txt'. - Missing sub-directories are NOT created automatically.: + The remote path on the server, like '~/yacy/seed.txt'. Missing sub-directories are NOT created automatically. +
    Username:: Your log-in at the server
    Password:: The password