diff --git a/htroot/SettingsAck_p.html b/htroot/SettingsAck_p.html index fbaf69bcb..0d4b1dd82 100644 --- a/htroot/SettingsAck_p.html +++ b/htroot/SettingsAck_p.html @@ -28,14 +28,20 @@ Your request cannot be processed.
Nothing changed. Your administration account setting has been made.
Your new administration account name is #[user]#. The password has been accepted.
If you go back to the Settings page, you must log-in again. :: -Your proxy account setting has been changed.
+Your proxy access setting has been changed.
Your proxy account check has been disabled, since you did not supply a password.
-The new proxy IP filter is set to #[filter]# +The new proxy IP filter is set to #[filter]#
+Transparent Proxy Support is: #[isTransparentProxy]#

+The proxy port is: #[port]#
+if you changed the Port, you need to restart YaCy. :: -Your proxy account setting has been changed.
+Your proxy access setting has been changed.
Your new proxy account name is #[user]#. The password has been accepted.
If you open any public web page through the proxy, you must log-in then.
-The new proxy IP filter is set to #[filter]#. +The new proxy IP filter is set to #[filter]#.
+Transparent Proxy Support is: #[isTransparentProxy]#

+The proxy port is: #[port]#
+if you changed the Port, you need to restart YaCy. :: Your server access filter is now set to #[filter]#
+ + + + + + + + +
+ +

+
Proxy Access Settings + + + + + + + + + + - - - - - - -
Proxy and Administration Port:Changes will take effect after restart only.
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]# -
-
-

- - -

-
Remote Proxy (optional) -

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

-

- - - - - - - - - - - - - - - - - - - - -
Remote proxy host:
Remote proxy port:
no-proxy adresses:
Use remote proxy:
-

-

- -

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


- -

-
Proxy Access Settings -

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.

-

- - - - - -
IP-Number filter:
Account Name:     
Password:
Password (repeat same as above):
-

-

- -

-
Server Access Settings -

Here you can restrict access to the server. By default, the access is not limited, because this function is needed to spawn the p2p index-sharing function. If you block access to your server (setting anything else than '*'), then you will also be blocked from using other peers' indexes for search service. However, blocking access may be correct in enterprise environments where you only want to index your company's own web pages.

-

ATTENTION: your current IP is recognized as "#[clientIP]#". If the value you enter here does not match with this IP, you will not be able to access the server pages any more

-

- - - - -
IP-Number filter:
     
-

-

- -

-
System Behaviour Settings - - - -
Auto pop-up of status page on start-up: /
-
-

- -

-

-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 had been changes to the seed-list. -

-
- - - - - - - - - - - - - - -
Upload Method: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'
-
- -#{seedUploadMethods}# -#%[file]%# -#{/seedUploadMethods}# -
- -
-

-
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/

-

- - - - - - - -#{parser}# - - - - - - -#{/parser}# - - - - - - - -
ActivateMime-TypeParser Class Name
#[mime]##[shortname]#
- Enable all parsers 
 Changes take effect immediately
-

-

- -#[footer]# - - + + + + +

You can restrict the access to this proxy 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.

+

+ + + + + +
IP-Number filter:
Account Name:     
Password:
Password (repeat same as above):
+ +
+ +

+
Remote Proxy (optional) +

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

+

+ + + + + + + + + + + + + + + + + + + + +
Remote proxy host:
Remote proxy port:
no-proxy adresses:
Use remote proxy:
+

+

+ +

+
Server Access Settings +

Here you can restrict access to the server. By default, the access is not limited, because this function is needed to spawn the p2p index-sharing function. If you block access to your server (setting anything else than '*'), then you will also be blocked from using other peers' indexes for search service. However, blocking access may be correct in enterprise environments where you only want to index your company's own web pages.

+

ATTENTION: your current IP is recognized as "#[clientIP]#". If the value you enter here does not match with this IP, you will not be able to access the server pages any more

+

+ + + + +
IP-Number filter:
     
+

+

+ +

+
System Behaviour Settings + + + +
Auto pop-up of status page on start-up: /
+
+

+ +

+

+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 had been changes to the seed-list. +

+
+ + + + + + + + + + + + + + +
Upload Method: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'
+
+ +#{seedUploadMethods}# +#%[file]%# +#{/seedUploadMethods}# +
+ +
+

+
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/

+

+ + + + + + + +#{parser}# + + + + + + +#{/parser}# + + + + + + + +
ActivateMime-TypeParser Class Name
#[mime]##[shortname]#
+ Enable all parsers 
 Changes take effect immediately
+

+

+ +#[footer]# + + diff --git a/htroot/Settings_p.java b/htroot/Settings_p.java index b52db1756..06c64e8ad 100644 --- a/htroot/Settings_p.java +++ b/htroot/Settings_p.java @@ -66,8 +66,11 @@ public final class Settings_p { //if (post == null) System.out.println("POST: NULL"); else System.out.println("POST: " + post.toString()); prop.put("port", env.getConfig("port", "8080")); - prop.put("peerName", env.getConfig("peerName", "nameless")); prop.put("isTransparentProxy", env.getConfig("isTransparentProxy", "false").equals("true") ? 1 : 0); + prop.put("peerName", env.getConfig("peerName", "nameless")); + String peerLang = env.getConfig("htLocaleSelection", "default"); + if (peerLang.equals("default")) peerLang = "en"; + prop.put("peerLang", peerLang); // set values String s;