- first review of Settings_*.inc, IndexShare_p and IndexControl regarding XHTML

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3103 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
karlchenofhell 18 years ago
parent defef70a9f
commit a44ef51a8b

@ -76,7 +76,7 @@
</colgroup>
<tr valign="top" class="TableCellDark">
<td>Index&nbsp;Distribution:</td>
<td><input type="checkbox" name="indexDistribute" #[indexDistributeChecked]# /></td>
<td><input type="checkbox" name="indexDistribute" #(indexDistributeChecked)#::checked="checked" #(/indexDistributionChecked)#/></td>
<td></td>
<td>This enables automated, DHT-ruled Index Transmission to other peers.
</td>
@ -84,12 +84,12 @@
<tr valign="top" class="TableCellDark">
<td></td>
<td>&nbsp;&nbsp;</td>
<td><input type="checkbox" name="indexDistributeWhileCrawling" #[indexDistributeWhileCrawling]# /></td>
<td><input type="checkbox" name="indexDistributeWhileCrawling" #(indexDistributeWhileCrawling)#::checked="checked" #(/indexDistributeWhileCrawling)#/></td>
<td>If checked, DHT-Transmission is enabled even during crawling.</td>
</tr>
<tr valign="top" class="TableCellDark">
<td>Index Receive:</td>
<td><input type="checkbox" name="indexReceive" #[indexReceiveChecked]# /></td>
<td><input type="checkbox" name="indexReceive" #(indexReceiveChecked)#::checked="checked" #(/indexReceiveChecked)#::/></td>
<td></td>
<td>Accept remote Index Transmissions. This works only if you are a senior peer.
The DHT-rules do not work without this function.</td>
@ -97,7 +97,7 @@
<tr valign="top" class="TableCellDark">
<td></td>
<td>&nbsp;&nbsp;</td>
<td><input type="checkbox" name="indexReceiveBlockBlacklist" #[indexReceiveBlockBlacklistChecked]# /></td>
<td><input type="checkbox" name="indexReceiveBlockBlacklist" #(indexReceiveBlockBlacklistChecked)#::checked="checked" #(/indexReceiveBlockBlacklistChecked)#/></td>
<td>If checked, your peer silently ignores transmitted URLs that match your blacklist</td>
</tr>
<tr valign="top" class="TableCellDark">
@ -130,7 +130,7 @@
<form action="IndexControl_p.html" method="post" enctype="multipart/form-data">
#{urlList}# #(urlExists)#
<input type="checkbox" name="urlhx.#[urlhxCount]#" checked value="#[urlhxValue]#" align="top" /><span class="tt">#[urlhxValue]#&nbsp;&lt;unresolved URL Hash&gt;</span><br />
::<input type="checkbox" name="urlhx.#[urlhxCount]#" #(urlhxChecked)#::checked #(/urlhxChecked)#value="#[urlhxValue]#" align="top" />
::<input type="checkbox" name="urlhx.#[urlhxCount]#" #(urlhxChecked)#::checked="checked" #(/urlhxChecked)#value="#[urlhxValue]#" align="top" />
<a href="/IndexControl_p.html?keystring=#[keyString]#&amp;keyhash=#[keyHash]#&amp;urlhash=#[urlhxValue]#&amp;urlstringsearch=&amp;urlstring=#[urlString]#" class="tt">#[urlhxValue]#</a><span class="tt">&nbsp;#[urlString]#, pos=#[pos]#</span><br />
#(/urlExists)# #{/urlList}#
<input type="hidden" name="keystring" value="#[keyString]#" />

@ -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
}

@ -19,11 +19,11 @@
<tr valign="top" bgcolor="#CCDDCC">
<td>Index:&nbsp;</td>
<td>
<input type="checkbox" name="distribute" value="" align="top" #[distributecheck]# />distribute&nbsp;<br />
<input type="checkbox" name="receive" value="" align="top" #[receivecheck]# />receive
<input type="checkbox" name="distribute" value="" align="top" #(distributecheck)#::checked="checked" #(/distributecheck)#/>distribute&nbsp;<br />
<input type="checkbox" name="receive" value="" align="top" #(receivecheck)#::checked="checked" #(/receivecheck)#/>receive
</td>
<td>
&nbsp;&nbsp;&nbsp;receive&nbsp;grant&nbsp;default:&nbsp;<br>
&nbsp;&nbsp;&nbsp;receive grant default: <br />
&nbsp;&nbsp;&nbsp;for each remote peer&nbsp;
</td>
<td>

@ -80,6 +80,7 @@ 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;
}

@ -25,8 +25,8 @@
</tr>
<tr valign="top" class="TableCellLight">
<td>Prefetch Depth</td>
<td><input name="proxyPrefetchDepth" type="text" size="2" maxlength="2" value="#[proxyPrefetchDepth]#" /></td>
<td><label for="prxy_prefetch">Prefetch Depth</label></td>
<td><input name="proxyPrefetchDepth" id="prxy_prefetch" type="text" size="2" maxlength="2" value="#[proxyPrefetchDepth]#" /></td>
<td>
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 @@
</td>
</tr>
<tr valign="top" class="TableCellLight">
<td>Store to Cache</td>
<td><input type="checkbox" name="proxyStoreHTCache" #(proxyStoreHTCacheChecked)#::checked="checked"#(/proxyStoreHTCacheChecked)# /></td>
<td><label for="prxy_storeHTCache">Store to Cache</label></td>
<td><input type="checkbox" id="prxy_storeHTCache" name="proxyStoreHTCache"#(proxyStoreHTCacheChecked)#:: checked="checked"#(/proxyStoreHTCacheChecked)# /></td>
<td>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.</td>
</tr>
<tr valign="top" class="TableCellLight">
<td>Do Remote Indexing</td>
<td><input type="checkbox" name="proxyCrawlOrder" #(proxyCrawlOrder)#::checked="checked"#(/proxyCrawlOrder)# /></td>
<td><label for="prxy_crawl_order">Do Remote Indexing</label></td>
<td><input type="checkbox" id="prxy_crawl_order" name="proxyCrawlOrder"#(proxyCrawlOrder)#:: checked="checked"#(/proxyCrawlOrder)# /></td>
<td>
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 @@
</tr>
<tr valign="top" class="TableCellLight">
<td>Path</td>
<td><input name="proxyCache" type="text" size="20" maxlength="300" value="#[proxyCache]#" /></td>
<td><label for="prxy_path">Path</label></td>
<td><input name="proxyCache" type="text" id="prxy_path" size="20" maxlength="300" value="#[proxyCache]#" /></td>
<td>The path where the pages are stored (max. length 300)</td>
</tr>
<tr valign="top" class="TableCellLight">
<td>Size</td>
<td><input name="proxyCacheSize" type="text" size="8" maxlength="24" value="#[proxyCacheSize]#" /></td>
<td><label for="HTCache_size">Size</label></td>
<td><input name="proxyCacheSize" type="text" id="HTCache_size" size="8" maxlength="24" value="#[proxyCacheSize]#" /></td>
<td>The size in MB of the cache.</td>
</tr>

@ -1,32 +1,36 @@
<p><form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<fieldset><legend id="http">HTTP Networking</legend>
<table border="0" cellspacing="5">
<tr valign="top">
<td>Transparent&nbsp;Proxy:</td>
<td><input type="checkbox" name="isTransparentProxy" align="top" #(isTransparentProxy)#::checked#(/isTransparentProxy)#></td>
<td>With this you can specify if YaCy can be used as transparent proxy.<br>
<i>Hint: On linux you can configure your firewall to transparently redirect all http traffic through yacy using this iptables rule:</i><br>
<td><label for="trans_proxy">Transparent Proxy</label>:</td>
<td><input type="checkbox" name="isTransparentProxy" id="trans_proxy" align="top" #(isTransparentProxy)#::checked="checked" #(/isTransparentProxy)#/></td>
<td>
With this you can specify if YaCy can be used as transparent proxy.<br />
<i>Hint: On linux you can configure your firewall to transparently redirect all http traffic through yacy using this iptables rule:</i><br />
<small><code>iptables -t nat -A PREROUTING -p tcp -s 192.168.0.0/16 --dport 80 -j DNAT --to 192.168.0.1:#[port]#</code></small>
</td>
</tr>
<tr valign="top">
<td>Connection&nbsp;Keep-Alive:</td>
<td><input type="checkbox" name="connectionKeepAliveSupport" align="top" #(connectionKeepAliveSupport)#::checked#(/connectionKeepAliveSupport)#></td>
<td><label for="conn_keep_alive">Connection Keep-Alive</label>:</td>
<td><input type="checkbox" name="connectionKeepAliveSupport" id="conn_keep_alive" align="top" #(connectionKeepAliveSupport)#::checked="checked" #(/connectionKeepAliveSupport)#/></td>
<td>With this you can specify if YaCy should support the HTTP connection keep-alive feature.</td>
</tr>
<tr valign="top">
<td>Send&nbsp;Via&nbsp;Header:</td>
<td><input type="checkbox" name="proxy.sendViaHeader" align="top" #(proxy.sendViaHeader)#::checked#(/proxy.sendViaHeader)#></td>
<td>Specifies if the proxy should send the <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.45">Via</a> http header according to RFC 2616 Sect 14.45.</td>
<td><label for="via_header">Send "Via" Header</label>:</td>
<td><input type="checkbox" name="proxy.sendViaHeader" id="via_header" align="top" #(proxy.sendViaHeader)#::checked="checked" #(/proxy.sendViaHeader)#/></td>
<td>
Specifies if the proxy should send the <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.45">Via</a>
http header according to RFC 2616 Sect 14.45.
</td>
</tr>
<tr valign="top">
<td>Send&nbsp;X-Forwarded-For&nbsp;Header:</td>
<td><input type="checkbox" name="proxy.sendXForwardedForHeader" align="top" #(proxy.sendXForwardedForHeader)#::checked#(/proxy.sendXForwardedForHeader)#></td>
<td><label for="x_forwarded_header">Send "X-Forwarded-For" Header</label>:</td>
<td><input type="checkbox" name="proxy.sendXForwardedForHeader" id="x_forwarded_header" align="top" #(proxy.sendXForwardedForHeader)#::checked="checked" #(/proxy.sendXForwardedForHeader)#/></td>
<td>Specifies if the proxy should send the X-Forwarded-For http header.</td>
</tr>
<tr valign="top">
<td colspan="3"><input type="submit" name="httpNetworking" value="Submit">&nbsp;<i>Changes will take effect immediately.</i></td>
<td colspan="3"><input type="submit" name="httpNetworking" value="Submit"> <i>Changes will take effect immediately.</i></td>
</tr>
</table>
</fieldset>
</form><br>
</form><br />

@ -1,27 +1,31 @@
<p><form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<fieldset><legend id="messageForwarding">Message Forwarding</legend>
<p>With this settings you can activate or deactivate forwarding of yacy-messages via email.
<p>
<p>With this settings you can activate or deactivate forwarding of yacy-messages via email.</p>
<table border="0" cellspacing="5">
<tr valign="top">
<td>Enable message forwarding:</td>
<td><input type="checkbox" name="msgForwardingEnabled" align="top" #(msgForwardingEnabled)#::checked#(/msgForwardingEnabled)#></td>
<td><i>Enabling/Disabling message forwarding via email.</td>
<td><label for="msg_forwarding">Enable message forwarding</label>:</td>
<td><input type="checkbox" name="msgForwardingEnabled" id="msg_forwarding" align="top" #(msgForwardingEnabled)#::checked="checked" #(/msgForwardingEnabled)#/></td>
<td><i>Enabling/Disabling message forwarding via email.</i></td>
</tr>
<tr valign="top">
<td>Forwarding Command:</td>
<td><input name="msgForwardingCmd" type="text" size="32" value="#[msgForwardingCmd]#"></td>
<td><i>The command-line program that should be used to forward the message.<br>e.g.:</i>&nbsp;<code>/usr/sbin/sendmail</code></td>
<td><label for="fwd_cmd">Forwarding Command</label>:</td>
<td><input name="msgForwardingCmd" id="fwd_cmd" type="text" size="32" value="#[msgForwardingCmd]#"></td>
<td>
<i>The command-line program that should be used to forward the message.<br />
e.g.:</i> <code>/usr/sbin/sendmail</code>
</td>
</tr>
<tr valign="top">
<td>Forwarding To:</td>
<td><input name="msgForwardingTo" type="text" size="32" maxlength="128" value="#[msgForwardingTo]#"></td>
<td><i>The recipient email-address.<br> e.g.:</i>&nbsp;<code>root@localhost</code></td>
<td><label for="fwd_to">Forwarding To</label>:</td>
<td><input name="msgForwardingTo" id="fwd_to" type="text" size="32" maxlength="128" value="#[msgForwardingTo]#"></td>
<td>
<i>The recipient email-address.<br />
e.g.:</i> <code>root@localhost</code>
</td>
</tr>
<tr valign="top">
<td colspan="3"><input type="submit" name="msgForwarding" value="Submit">&nbsp;<i>Changes will take effect immediately.</i></td>
<td colspan="3"><input type="submit" name="msgForwarding" value="Submit"> <i>Changes will take effect immediately.</i></td>
</tr>
</table>
</fieldset>
</form><br>
</form><br />

@ -1,43 +1,37 @@
<p><form name="parsersettings" action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<form name="parsersettings" action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<fieldset><legend id="parser">Content Parser Settings</legend>
<p>With this settings you can activate or deactivate parsing of additional content-types based on their MIME-types.<br>
For a detailed description of the various MIME-types take a look at <a href="http://www.iana.org/assignments/media-types/">http://www.iana.org/assignments/media-types/</a></p>
<p>
With this settings you can activate or deactivate parsing of additional content-types based on their MIME-types.<br />
For a detailed description of the various MIME-types take a look at
<a href="http://www.iana.org/assignments/media-types/">http://www.iana.org/assignments/media-types/</a>
</p>
<table border="0" cellpadding="2" cellspacing="1">
<tr class="TableHeader" valign="bottom">
#{parserMode}#
<td class="small" >#[name]#</td>
#{/parserMode}#
<td class="small" >Mime-Type</td>
<td class="small" >Parser&nbsp;Usage</td>
<td class="small" ></td>
</tr>
#{parser}#
<tr class="TableCellDark">
<td colspan="#[colspan]#"><nobr>#[name]# V#[version]#<nobr></td>
<tr class="TableHeader" valign="bottom">#{parserMode}#
<td class="small" >#[name]#</td>#{/parserMode}#
<td class="small" >Mime-Type</td>
<td class="small" >Parser&nbsp;Usage</td>
<td class="small" ></td>
</tr>#{parser}#
<tr class="TableCellDark">
<td colspan="#[colspan]#"><nobr>#[name]# V#[version]#</nobr></td>
<td>#[usage]#</td>
<td>&nbsp;</td>
</tr>
#{mime}#
<tr class="TableCellLight">
#{parserMode}#
<td class="small" align="center"><input type="checkbox" name="#[optionName]#" align="top" #(status)#::checked#(/status)#></td>
#{/parserMode}#
</tr>#{mime}#
<tr class="TableCellLight">#{parserMode}#
<td class="small" align="center"><input type="checkbox" name="#[optionName]#" align="top" #(status)#::checked="checked" #(/status)#/></td>#{/parserMode}#
<td class="small">#[mimetype]#</td>
<td class="small">&nbsp;</td>
<td class="small" width="100%"></td>
</tr>
#{/mime}#
#{/parser}#
<tr class="TableCellDark">
#{parserMode}#
<td class="small" align="center"><input type="checkbox" name="#[name]#.allParserEnabled" align="top" onclick="javascript: ParserCheckboxes(this);" #(allParserEnabled)#::checked#(/allParserEnabled)#>
#{/parserMode}#
<td colspan="2" class="small" >Enable all parsers</td>
</tr>#{/mime}##{/parser}#
<tr class="TableCellDark">#{parserMode}#
<td class="small" align="center">
<input type="checkbox" name="#[name]#.allParserEnabled" align="top" onclick="javascript: ParserCheckboxes(this);" #(allParserEnabled)#::checked="checked" #(/allParserEnabled)#/>#{/parserMode}#
</td>
<td colspan="2" class="small">Enable all parsers</td>
<td class="small">&nbsp;</td>
</tr>
<tr class="TableCellDark">
<td colspan="#[parser.colspan]#" class="small" ><input type="submit" name="parserSettings" value="Submit">&nbsp;Changes take effect immediately</td>
<td colspan="#[parser.colspan]#" class="small" ><input type="submit" name="parserSettings" value="Submit" /> Changes take effect immediately</td>
</tr>
</table>
</fieldset>

@ -1,63 +1,66 @@
<p><form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<fieldset><legend id="portForwarding">Port Forwarding (optional)</legend>
<p>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.</p>
<p>
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.
</p>
#(portForwarding.Available)#<p><b><font color="red">You need to install libx to use this feature</font></b></p>::#(/portForwarding.Available)#
<table border="0" cellspacing="5">
<tr valign="top">
<td>Enable&nbsp;port&nbsp;forwarding:</td>
<td><input type="checkbox" name="portForwarding.Enabled" align="top" #(portForwarding.Enabled)#::checked#(/portForwarding.Enabled)##(portForwarding.Available)# disabled="disabled"::#(/portForwarding.Available)#></td>
<td>Enabling disabling port forwarding</td>
<td><label for="pfwd">Enable port forwarding</label>:</td>
<td><input type="checkbox" name="portForwarding.Enabled" id="pfwd" align="top" #(portForwarding.Enabled)#::checked="checked" #(/portForwarding.Enabled)##(portForwarding.Available)#disabled="disabled" ::#(/portForwarding.Available)#/></td>
<td>Enabling / disabling port forwarding</td>
</tr>
<tr valign="top">
<td>Forwarding method:</td>
<td><select name="portForwarding.Type" size="1">
<td><label for="sel_pfwd">Forwarding method</label>:</td>
<td><select name="portForwarding.Type" id="sel_pfwd" size="1">
#{forwardingMethods}#
<option value="#[name]#" #(selected)#::selected#(/selected)#>#[name]#</option>
<option value="#[name]#" #(selected)#::selected="selected"#(/selected)#>#[name]#</option>
#{/forwardingMethods}#
</select>
</td>
<td>Select the port forwarding method to use.</td>
</tr>
<tr><td colspan="3"><hr></td></tr>
<tr><td colspan="3"><hr /></td></tr>
<tr><td colspan="3"><b>Special settings for port forwarding using secure channel</b></td></tr>
<tr valign="top">
<td>Forwarding&nbsp;via&nbsp;proxy:</td>
<td><input type="checkbox" name="portForwarding.sch.UseProxy" align="top" #(portForwarding.sch.UseProxy)#::checked#(/portForwarding.sch.UseProxy)# DISABLED></td>
<td><!-- Specifies if the connection should be established through the <a href="#proxy">remote proxy</a>.-->
<i>Function not available at the moment.</i></td>
<td><label for="pfwd_proxy">Forwarding via proxy</label>:</td>
<td><input type="checkbox" name="portForwarding.sch.UseProxy" id="pfwd_proxy" align="top" #(portForwarding.sch.UseProxy)#::checked="checked" #(/portForwarding.sch.UseProxy)#disabled="disabled" /></td>
<td>
<!-- Specifies if the connection should be established through the <a href="#proxy">remote proxy</a>.-->
<i>Function not available at the moment.</i>
</td>
</tr>
<tr valign="top">
<td>Forwarding&nbsp;port:</td>
<td><input name="portForwarding.sch.Port" type="text" size="5" maxlength="5" value="#[portForwarding.sch.Port]#"></td>
<td><label for="pfwd_port">Forwarding port</label>:</td>
<td><input name="portForwarding.sch.Port" id="pfwd_port" type="text" size="5" maxlength="5" value="#[portForwarding.sch.Port]#" /></td>
<td>The tcp/ip port on the remote server that should be forwarded via the secure channel to the local host.</td>
</tr>
<tr valign="top">
<td>Forwarding&nbsp;host:</td>
<td><input name="portForwarding.sch.Host" type="text" size="32" maxlength="128" value="#[portForwarding.sch.Host]#"></td>
<td>ip address or name of the remote server</td>
<td><label for="pfwd_host">Forwarding host</label>:</td>
<td><input name="portForwarding.sch.Host" id="pfwd_host" type="text" size="32" maxlength="128" value="#[portForwarding.sch.Host]#" /></td>
<td>IP address or name of the remote server.</td>
</tr>
<tr valign="top">
<td>Forwarding&nbsp;host&nbsp;port:</td>
<td><input name="portForwarding.sch.HostPort" type="text" size="5" maxlength="5" value="#[portForwarding.sch.HostPort]#"></td>
<td>ssh port of the remote server</td>
<td><label for="pfwd_host_port">Forwarding host port</label>:</td>
<td><input name="portForwarding.sch.HostPort" id="pfwd_host_port" type="text" size="5" maxlength="5" value="#[portForwarding.sch.HostPort]#" /></td>
<td>SSH port of the remote server.</td>
</tr>
<tr valign="top">
<td>Forwarding&nbsp;host&nbsp;user:</td>
<td><input name="portForwarding.sch.HostUser" type="text" size="32" maxlength="128" value="#[portForwarding.sch.HostUser]#"></td>
<td>username to login on the remote server</td>
<td><label for="pfwd_host_user">Forwarding host user</label>:</td>
<td><input name="portForwarding.sch.HostUser" id="pfwd_host_user" type="text" size="32" maxlength="128" value="#[portForwarding.sch.HostUser]#" /></td>
<td>Username to login on the remote server.</td>
</tr>
<tr valign="top">
<td>Forwarding&nbsp;host&nbsp;password:</td>
<td><input name="portForwarding.sch.HostPwd" type="password" size="32" maxlength="128" value="#[portForwarding.sch.HostPwd]#"></td>
<td>password to login on the remote server</td>
<td><label for="pfwd_host_pwd">Forwarding host password</label>:</td>
<td><input name="portForwarding.sch.HostPwd" id="pfwd_host_pwd" type="password" size="32" maxlength="128" value="#[portForwarding.sch.HostPwd]#" /></td>
<td>Password to login on the remote server.</td>
</tr>
<tr><td colspan="3"><hr></td></tr>
<tr valign="top">
<td colspan="3"><input type="submit" name="portForwarding" value="Submit"#(portForwarding.Available)# disabled="disabled"::#(/portForwarding.Available)#>&nbsp;<i>Changes will take effect immediately.</i></td>
<td colspan="3"><input type="submit" name="portForwarding" value="Submit"#(portForwarding.Available)# disabled="disabled"::#(/portForwarding.Available)# /> <i>Changes will take effect immediately.</i></td>
</tr>
</table>
</fieldset>
</form><br>
</form><br />

@ -1,64 +1,66 @@
<p><form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<fieldset><legend id="proxy">Remote Proxy (optional)</legend>
<p>YaCy can use another proxy to connect to the internet. You can enter the address for the remote proxy here:</p>
<p><table border="0" cellspacing="5">
<table border="0" cellspacing="5">
<!-- enabling/disabling remote proxy usage -->
<tr valign="top">
<td>Use remote proxy:</td>
<td><input type="checkbox" name="remoteProxyUse" align="top" #(remoteProxyUseChecked)#::checked#(/remoteProxyUseChecked)#></td>
<td><label for="rem_prxy">Use remote proxy</label>:</td>
<td><input type="checkbox" name="remoteProxyUse" id="rem_prxy" align="top"#(remoteProxyUseChecked)#:: checked="checked"#(/remoteProxyUseChecked)# /></td>
<td>&nbsp;</td>
<td>Enables the usage of the remote proxy by yacy</td>
</tr>
<tr valign="top">
<td colspan="2">Use remote proxy for yacy <-> yacy communication</td>
<td><input type="checkbox" name="remoteProxyUse4Yacy" align="top" #(remoteProxyUse4Yacy)#::checked#(/remoteProxyUse4Yacy)#></td>
<td>Specifies if the remote proxy should be used for the communication of this peer to other yacy peers.<br />
<em>Hint:</em> Enabling this option could cause this peer to remain in junior status.</td>
<td colspan="2"><label for="prxy4yacy">Use remote proxy for yacy &lt;-&gt; yacy communication</label></td>
<td><input type="checkbox" name="remoteProxyUse4Yacy" id="prxy4yacy" align="top"#(remoteProxyUse4Yacy)#:: checked="checked"#(/remoteProxyUse4Yacy)# /></td>
<td>
Specifies if the remote proxy should be used for the communication of this peer to other yacy peers.<br />
<em>Hint:</em> Enabling this option could cause this peer to remain in junior status.
</td>
</tr>
<tr valign="top">
<td colspan="2">Use remote proxy for https</td>
<td><input type="checkbox" name="remoteProxyUse4SSL" align="top" #(remoteProxyUse4SSL)#::checked#(/remoteProxyUse4SSL)#></td>
<td colspan="2"><label for="prxy4ssl">Use remote proxy for HTTPS</label></td>
<td><input type="checkbox" name="remoteProxyUse4SSL" id="prxy4ssl" align="top"#(remoteProxyUse4SSL)#:: checked="checked"#(/remoteProxyUse4SSL)# /></td>
<td>Specifies if YaCy should forward ssl connections to the remote proxy.</td>
</tr>
<tr><td colspan="4"><hr></td></tr>
<!-- remote proxy hostname + port -->
<tr valign="top">
<td>Remote proxy host:</td>
<td colspan="2"><input name="remoteProxyHost" type="text" size="32" maxlength="128" value="#[remoteProxyHost]#"></td>
<td><label for="host">Remote proxy host</label>:</td>
<td colspan="2"><input name="remoteProxyHost" id="host" type="text" size="32" maxlength="128" value="#[remoteProxyHost]#" /></td>
<td>The ip address or domain name of the remote proxy</td>
</tr>
<tr valign="top">
<td>Remote proxy port:</td>
<td colspan="2"><input name="remoteProxyPort" type="text" size="5" maxlength="5" value="#[remoteProxyPort]#"></td>
<td><label for="port">Remote proxy port</label>:</td>
<td colspan="2"><input name="remoteProxyPort" id="port" type="text" size="5" maxlength="5" value="#[remoteProxyPort]#" /></td>
<td>the port of the remote proxy</td>
</tr>
<!-- remote proxy username + pwd -->
<tr valign="top">
<td>Remote proxy user:</td>
<td colspan="2"><input name="remoteProxyUser" type="text" size="32" maxlength="128" value="#[remoteProxyUser]#"></td>
<td><label for="user">Remote proxy user</label>:</td>
<td colspan="2"><input name="remoteProxyUser" type="text" id="user" size="32" maxlength="128" value="#[remoteProxyUser]#" /></td>
<td>&nbsp;</td>
</tr>
</tr>
<tr valign="top">
<td>Remote proxy pwd:</td>
<td colspan="2"><input name="remoteProxyPwd" type="password" size="32" maxlength="128" value="#[remoteProxyPwd]#"></td>
<td><label for="pwd">Remote proxy password</label>:</td>
<td colspan="2"><input name="remoteProxyPwd" id="pwd" type="password" size="32" maxlength="128" value="#[remoteProxyPwd]#" /></td>
<td>&nbsp;</td>
</tr>
<tr><td colspan="4"><hr></td></tr>
<!-- no remote proxy pattern -->
<tr valign="top">
<td>no-proxy adresses:</td>
<td colspan="2"><input name="remoteProxyNoProxy" type="text" size="32" maxlength="128" value="#[remoteProxyNoProxy]#"></td>
<td><label for="no_prxy">No-proxy adresses</label>:</td>
<td colspan="2"><input name="remoteProxyNoProxy" type="text" id="no_prxy" size="32" maxlength="128" value="#[remoteProxyNoProxy]#" /></td>
<td>IP addresses for which the remote proxy should not be used</td>
</tr>
<!-- submit button -->
<tr valign="top">
<td colspan="4"><input type="submit" name="proxysettings" value="Submit">&nbsp; <em>Changes will take effect immediately.</em></td>
<td colspan="4"><input type="submit" name="proxysettings" value="Submit" /> <em>Changes will take effect immediately.</em></td>
</tr>
</table>
</fieldset>

@ -1,41 +1,59 @@
<p><form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<fieldset><legend id="ProxyAccess">Proxy Access Settings</legend>
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.<br />
<br /><strong>Server/Proxy Port Configuration</strong><br />
<p>The socket addresses where YaCy should listen for incoming connections from other YaCy peers or http clients.<br />
You have four possibilities to specify the address:<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>
</ul><br />
<em>Hint: Dont forget to change your firewall configuration after you have changed the port.</em>
<p>
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.<br />
<br />
<strong>Server/Proxy Port Configuration</strong>
</p>
<p>
The socket addresses where YaCy should listen for incoming connections from other YaCy peers or http clients.<br />
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>
</ul>
<p><em>Hint: Dont forget to change your firewall configuration after you have changed the port.</em></p>
<table border="0" cellspacing="5">
<tr valign="top">
<td>Proxy and http-Server Administration Port:</td>
<td><input name="port" type="text" size="30" maxlength="30" value="#[port]#"></td>
<td><label for="port">Proxy and http-Server Administration Port</label>:</td>
<td><input name="port" id="port" type="text" size="30" maxlength="30" value="#[port]#" /></td>
<td><em>Changes will take effect in 5-10 seconds</em></td>
</tr>
</table>
<p><strong>Server Access Restrictions</strong><br /><br />You can restrict the access to this proxy/server using a two-stage security barrier:
<p>
<strong>Server Access Restrictions</strong><br />
<br />
You can restrict the access to this proxy/server using a two-stage security barrier:
</p>
<ul>
<li>define an <em>access domain</em> with a list of granted client IP-numbers or with wildcards</li>
<li>define an <em>user account</em> with an user:password - pair</li>
</ul><br />
<p>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.</p>
<li>define an <em>access domain</em> with a list of granted client IP-numbers or with wildcards</li>
<li>define an <em>user account</em> with an user:password - pair</li>
</ul>
<p>
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.
</p>
<table border="0" cellspacing="5">
<tr valign="top">
<td>IP-Number filter:</td>
<td colspan ="2"><input name="proxyfilter" type="text" size="50" maxlength="1000" value="#[proxyfilter]#"></td>
<td><label for="filter">IP-Number filter</label>:</td>
<td colspan ="2">
<input name="proxyfilter" id="filter" type="text" size="50" maxlength="1000" value="#[proxyfilter]#" />
</td>
</tr>
<tr valign="top">
<td>Accounts:</td>
<td><input name="use_proxyaccounts" type="checkbox" size="16" maxlength="16" value="on" #(use_proxyAccounts)#::checked#(/use_proxyAccounts)#> Use <a href="User_p.html">Proxy Accounts</a></td>
<td><label for="accounts">Accounts</label>:</td>
<td>
<input name="use_proxyaccounts" id="accounts" type="checkbox" size="16" maxlength="16" value="on"#(use_proxyAccounts)#:: checked="checked"#(/use_proxyAccounts)# />
Use <a href="User_p.html">Proxy Accounts</a>
</td>
</tr>
<tr valign="top">
<td colspan="2"><input type="submit" name="proxyaccount" value="Submit"></td>

@ -1,33 +1,40 @@
<p>
<fieldset>
<legend id="seed">Seed Upload Settings</legend>
<p>With these settings you can configure if you have an account on a public accessible
server where you can host a seed-list file.</p>
<p><b>General Settings:</b></p>
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.
<p>
With these settings you can configure if you have an account on a public accessible
server where you can host a seed-list file.
</p>
<p>
<strong>General Settings:</strong>
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.
</p>
<form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<table border="0" cellspacing="5">
<tr valign="top">
<td>Upload Method:</td>
<td><select name="seedUploadMethod" size="1">
<td><label for="method">Upload Method</label>:</td>
<td><select name="seedUploadMethod" id="method" size="1">
#{seedUploadMethods}#
<option value="#[name]#" #(selected)#::selected#(/selected)#>#[name]#</option>
<option value="#[name]#"#(selected)#:: selected="selected"#(/selected)#>#[name]#</option>
#{/seedUploadMethods}#
</select>
<input type="submit" name="seedUploadRetry" value="Retry Uploading"></td>
<td><i>Here you can specify which upload method should be used. Select 'none' to deactivate uploading.</i></td>
<input type="submit" name="seedSettings" value="Submit" />
</td>
<td><em>Here you can specify which upload method should be used. Select 'none' to deactivate uploading.</em></td>
</tr>
<tr valign="top">
<td>URL:</td>
<td><input name="seedURL" type="text" size="40" value="#[seedURL]#"></td>
<td><i>The URL that can be used to retrieve the uploaded seed file, like
http://www.&lt;my-host&gt;.net/yacy/seed.txt'</i></td>
<td><label for="url">URL</label>:</td>
<td><input name="seedURL" type="text" id="url" size="40" value="#[seedURL]#" /></td>
<td>
<i>
The URL that can be used to retrieve the uploaded seed file, like
http://www.&lt;my-host&gt;.net/yacy/seed.txt'
</i>
</td>
</tr>
<tr>
<td colspan="3"><input type="submit" name="seedSettings" value="Submit"></td>
<td colspan="3"><input type="submit" name="seedUploadRetry" value="Retry Uploading" /></td>
</tr>
</table>
</form>

@ -1,15 +1,15 @@
<p><fieldset>
<b>Store into filesystem:</b></p>
<fieldset>
<p><strong>Store into filesystem:</strong></p>
<p>You must configure this if you want to store the seed-list file onto the file system.</p>
<form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<table border="0" cellspacing="5">
<tr valign="top">
<td>File&nbsp;Location:</td>
<td><input name="seedFilePath" type="text" size="40" value="#[seedFilePath]#"></td>
<td><label for="fs_path">File Location</label>:</td>
<td><input name="seedFilePath" type="text" id="fs_path" size="40" value="#[seedFilePath]#" /></td>
<td><i>Here you can specify the path within the filesystem where the seed-list file should be stored.</i></td>
</tr>
<tr>
<td colspan="3"><input type="submit" name="seedFileSettings" value="Submit"></td>
<td colspan="3"><input type="submit" name="seedFileSettings" value="Submit" /></td>
</tr>
</table>
</form>

@ -1,35 +1,37 @@
<p><fieldset>
<b>Uploading via FTP:</b></p>
<p>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.
<fieldset>
<p><strong>Uploading via FTP:</strong></p>
<p>
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.
</p>
<form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<table border="0" cellspacing="5">
<tr valign="top">
<td>Server:</td>
<td><input name="seedFTPServer" type="text" size="40" value="#[seedFTPServer]#"></td>
<td><label for="ftp_server">Server</label>:</td>
<td><input name="seedFTPServer" type="text" id="ftp_server" size="40" value="#[seedFTPServer]#" /></td>
<td><i>The host where you have a FTP account, like 'ftp.&lt;my-host&gt;.net'</i></td>
</tr>
<tr valign="top">
<td>Path:</td>
<td><input name="seedFTPPath" type="text" size="40" value="#[seedFTPPath]#"></td>
<td><i>The remote path on the FTP server, like 'yacy/seed.txt'.
Missing sub-directories are NOT created automatically.</i></td>
<td><label for="ftp_path">Path</label>:</td>
<td><input name="seedFTPPath" type="text" id="ftp_path" size="40" value="#[seedFTPPath]#" /></td>
<td>
<i>The remote path on the FTP server, like 'yacy/seed.txt'. Missing sub-directories are NOT created automatically.</i>
</td>
</tr>
<tr valign="top">
<td>Username:</td>
<td><input name="seedFTPAccount" type="text" size="40" value="#[seedFTPAccount]#"></td>
<td><label for="ftp_user">Username</label>:</td>
<td><input name="seedFTPAccount" type="text" id="ftp_user" size="40" value="#[seedFTPAccount]#" /></td>
<td><i>Your log-in at the FTP server</i></td>
</tr>
<tr valign="top">
<td>Password:</td>
<td><input name="seedFTPPassword" type="password" size="40" value="#[seedFTPPassword]#"></td>
<td><label for="ftp_pwd">Password</label>:</td>
<td><input name="seedFTPPassword" type="password" id="ftp_pwd" size="40" value="#[seedFTPPassword]#" /></td>
<td><i>The password</i></td>
</tr>
<tr>
<td colspan="3"><input type="submit" name="seedFtpSettings" value="Submit"></td>
<td colspan="3"><input type="submit" name="seedFtpSettings" value="Submit" /></td>
</tr>
</table>
</form>

@ -1,36 +1,37 @@
<p><fieldset>
<b>Uploading via SCP:</b></p>
<fieldset>
<p><strong>Uploading via SCP:</strong></p>
<p>This is the account for a server where you are able to login via ssh.</p>
<form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">
<table border="0" cellspacing="5">
<tr valign="top">
<td>Server:</td>
<td><input name="seedScpServer" type="text" size="40" value="#[seedScpServer]#"></td>
<td><label for="scp_serv">Server</label>:</td>
<td><input name="seedScpServer" type="text" id="scp_serv" size="40" value="#[seedScpServer]#" /></td>
<td><i>The host where you have an account, like 'my.host.net'</i></td>
</tr>
<tr valign="top">
<td>Server&nbsp;Port:</td>
<td><input name="seedScpServerPort" type="text" size="40" value="#[seedScpServerPort]#"></td>
<td><label for="scp_port">Server&nbsp;Port</label>:</td>
<td><input name="seedScpServerPort" type="text" id="scp_port" size="40" value="#[seedScpServerPort]#" /></td>
<td><i>The sshd port of the host, like '22'</i></td>
</tr>
<tr valign="top">
<td>Path:</td>
<td><input name="seedScpPath" type="text" size="40" value="#[seedScpPath]#"></td>
<td><i>The remote path on the server, like '~/yacy/seed.txt'.
Missing sub-directories are NOT created automatically.</i></td>
<td><label for="scp_path">Path</label>:</td>
<td><input name="seedScpPath" type="text" id="scp_path" size="40" value="#[seedScpPath]#" /></td>
<td>
<i>The remote path on the server, like '~/yacy/seed.txt'. Missing sub-directories are NOT created automatically.</i>
</td>
</tr>
<tr valign="top">
<td>Username:</td>
<td><input name="seedScpAccount" type="text" size="40" value="#[seedScpAccount]#"></td>
<td><label for="scp_user">Username</label>:</td>
<td><input name="seedScpAccount" type="text" id="scp_user" size="40" value="#[seedScpAccount]#" /></td>
<td><i>Your log-in at the server</i></td>
</tr>
<tr valign="top">
<td>Password:</td>
<td><input name="seedScpPassword" type="password" size="40" value="#[seedScpPassword]#"></td>
<td><label for="scp_pwd">Password</label>:</td>
<td><input name="seedScpPassword" type="password" id="scp_pwd" size="40" value="#[seedScpPassword]#" /></td>
<td><i>The password</i></td>
</tr>
<tr>
<td colspan="3"><input type="submit" name="seedScpSettings" value="Submit"></td>
<td colspan="3"><input type="submit" name="seedScpSettings" value="Submit" /></td>
</tr>
</table>
</form>

Loading…
Cancel
Save