[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 919a50208bc63214cda9c0cab7845c8f9391b8c2
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 919a50208bc63214cda9c0cab7845c8f9391b8c2 (commit) from bfcb3212dc3f316368f4632b1adf4579b586200f (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 919a50208bc63214cda9c0cab7845c8f9391b8c2 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Aug 10 12:14:29 2013 +0200
tor.cgi: Remove NoAdvertise option.
This does not make much sense with our setup.
-----------------------------------------------------------------------
Summary of changes: doc/language_issues.es | 1 - doc/language_issues.fr | 1 - doc/language_issues.nl | 1 - doc/language_issues.pl | 1 - doc/language_issues.ru | 1 - doc/language_issues.tr | 1 - doc/language_missings | 4 ---- html/cgi-bin/tor.cgi | 28 ++++++---------------------- langs/de/cgi-bin/de.pl | 1 - langs/en/cgi-bin/en.pl | 1 - 10 files changed, 6 insertions(+), 34 deletions(-)
Difference in files: diff --git a/doc/language_issues.es b/doc/language_issues.es index 9d241ab..790ce1a 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -642,7 +642,6 @@ WARNING: untranslated string: tor common settings WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info -WARNING: untranslated string: tor do not advertise relay WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit WARNING: untranslated string: tor errmsg invalid ip or mask diff --git a/doc/language_issues.fr b/doc/language_issues.fr index dffd620..41d8d9d 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -627,7 +627,6 @@ WARNING: untranslated string: tor common settings WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info -WARNING: untranslated string: tor do not advertise relay WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit WARNING: untranslated string: tor errmsg invalid ip or mask diff --git a/doc/language_issues.nl b/doc/language_issues.nl index b57eaea..46838b0 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -544,7 +544,6 @@ WARNING: untranslated string: tor common settings WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info -WARNING: untranslated string: tor do not advertise relay WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit WARNING: untranslated string: tor errmsg invalid ip or mask diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 9d241ab..790ce1a 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -642,7 +642,6 @@ WARNING: untranslated string: tor common settings WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info -WARNING: untranslated string: tor do not advertise relay WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit WARNING: untranslated string: tor errmsg invalid ip or mask diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 0a46803..6700696 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -607,7 +607,6 @@ WARNING: untranslated string: tor common settings WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info -WARNING: untranslated string: tor do not advertise relay WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit WARNING: untranslated string: tor errmsg invalid ip or mask diff --git a/doc/language_issues.tr b/doc/language_issues.tr index a9d5659..6c4502f 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -540,7 +540,6 @@ WARNING: untranslated string: tor common settings WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info -WARNING: untranslated string: tor do not advertise relay WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit WARNING: untranslated string: tor errmsg invalid ip or mask diff --git a/doc/language_missings b/doc/language_missings index 6aac6b8..3c611e6 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -136,7 +136,6 @@ < tor configuration < tor connected relays < tor contact info -< tor do not advertise relay < tor enabled < tor errmsg invalid accounting limit < tor errmsg invalid ip or mask @@ -372,7 +371,6 @@ < tor configuration < tor connected relays < tor contact info -< tor do not advertise relay < tor enabled < tor errmsg invalid accounting limit < tor errmsg invalid ip or mask @@ -560,7 +558,6 @@ < tor configuration < tor connected relays < tor contact info -< tor do not advertise relay < tor enabled < tor errmsg invalid accounting limit < tor errmsg invalid ip or mask @@ -753,7 +750,6 @@ < tor configuration < tor connected relays < tor contact info -< tor do not advertise relay < tor enabled < tor errmsg invalid accounting limit < tor errmsg invalid ip or mask diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index 2b57881..2a31dd4 100644 --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -77,7 +77,6 @@ $settings{'TOR_RELAY_ADDRESS'} = ''; $settings{'TOR_RELAY_PORT'} = 9001; $settings{'TOR_RELAY_NICKNAME'} = ''; $settings{'TOR_RELAY_CONTACT_INFO'} = ''; -$settings{'TOR_RELAY_NOADVERTISE'} = 'off'; $settings{'TOR_RELAY_BANDWIDTH_RATE'} = 0; $settings{'TOR_RELAY_BANDWIDTH_BURST'} = 0; $settings{'TOR_RELAY_ACCOUNTING_LIMIT'} = 0; @@ -283,10 +282,6 @@ END &Header::closebox();
# Tor relay box - $checked{'TOR_RELAY_NOADVERTISE'}{'on'} = ''; - $checked{'TOR_RELAY_NOADVERTISE'}{'off'} = ''; - $checked{'TOR_RELAY_NOADVERTISE'}{$settings{'TOR_RELAY_NOADVERTISE'}} = 'checked'; - $selected{'TOR_RELAY_MODE'}{'bridge'} = ''; $selected{'TOR_RELAY_MODE'}{'exit'} = ''; $selected{'TOR_RELAY_MODE'}{'private-bridge'} = ''; @@ -324,9 +319,9 @@ END <option value='private-bridge' $selected{'TOR_RELAY_MODE'}{'private-bridge'}>$Lang::tr{'tor relay mode private bridge'}</option> </select> </td> - <td width='25%' class='base'>$Lang::tr{'tor relay port'}:</td> + <td width='25%' class='base'>$Lang::tr{'tor relay nickname'}: <img src='/blob.gif' alt='*' /></td> <td width='20%'> - <input type='text' name='TOR_RELAY_PORT' value='$settings{'TOR_RELAY_PORT'}' size='5' /> + <input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' /> </td> </tr> <tr> @@ -334,22 +329,15 @@ END <td width='30%'> <input type='text' name='TOR_RELAY_ADDRESS' value='$settings{'TOR_RELAY_ADDRESS'}' /> </td> - <td width='25%' class='base'>$Lang::tr{'tor do not advertise relay'}:</td> + <td width='25%' class='base'>$Lang::tr{'tor relay port'}:</td> <td width='20%'> - <input type='checkbox' name='TOR_RELAY_NOADVERTISE' $checked{'TOR_RELAY_NOADVERTISE'}{'on'} /> - </td> - </tr> - <tr> - <td width='25%' class='base'>$Lang::tr{'tor relay nickname'}: <img src='/blob.gif' alt='*' /></td> - <td width='30%'> - <input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' /> + <input type='text' name='TOR_RELAY_PORT' value='$settings{'TOR_RELAY_PORT'}' size='5' /> </td> - <td colspan='2'></td> </tr> <tr> <td width='25%' class='base'>$Lang::tr{'tor contact info'}: <img src='/blob.gif' alt='*' /></td> <td width='75%' colspan='3'> - <input type='text' name='TOR_RELAY_CONTACT_INFO' value='$settings{'TOR_RELAY_CONTACT_INFO'}' size='60' /> + <input type='text' name='TOR_RELAY_CONTACT_INFO' value='$settings{'TOR_RELAY_CONTACT_INFO'}' style='width: 98%;' /> </td> </tr> </table> @@ -628,11 +616,7 @@ sub BuildConfiguration() { # Reject access to private networks. print FILE "ExitPolicyRejectPrivate 1\n";
- print FILE "ORPort $settings{'TOR_RELAY_PORT'}"; - if ($settings{'TOR_RELAY_NOADVERTISE'} eq 'on') { - print FILE " NoAdvertise"; - } - print FILE "\n"; + print FILE "ORPort $settings{'TOR_RELAY_PORT'}\n";
if ($settings{'TOR_RELAY_ADDRESS'} ne '') { print FILE "Address $settings{'TOR_RELAY_ADDRESS'}\n"; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 021682f..a0c426f 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1817,7 +1817,6 @@ 'tor configuration' => 'Tor-Konfiguration', 'tor connected relays' => 'Verbundene Relays', 'tor contact info' => 'Kontaktinformationen', -'tor do not advertise relay' => 'Relay nicht announcieren', 'tor enabled' => 'Tor einschalten', 'tor errmsg invalid accounting limit' => 'Ungültiges Accounting-Limit', 'tor errmsg invalid ip or mask' => 'Ungültiges IP-Subnetz', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 2e04c46..b12ae7d 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1852,7 +1852,6 @@ 'tor configuration' => 'Tor Configuration', 'tor connected relays' => 'Connected relays', 'tor contact info' => 'Contact Info', -'tor do not advertise relay' => 'Do not advertise the relay', 'tor enabled' => 'Enable Tor', 'tor errmsg invalid accounting limit' => 'Invalid accounting limit', 'tor errmsg invalid ip or mask' => 'Invalid IP subnet',
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org