From 919a50208bc63214cda9c0cab7845c8f9391b8c2 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 10 Aug 2013 12:14:29 +0200 Subject: [PATCH] tor.cgi: Remove NoAdvertise option. This does not make much sense with our setup. --- 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(-) diff --git a/doc/language_issues.es b/doc/language_issues.es index 9d241abb9..790ce1acc 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 dffd62024..41d8d9d78 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 b57eaeabf..46838b024 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 9d241abb9..790ce1acc 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 0a468036c..670069683 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 a9d565933..6c4502fd6 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 6aac6b857..3c611e617 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 2b578810d..2a31dd4bf 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 - $Lang::tr{'tor relay port'}: + $Lang::tr{'tor relay nickname'}: * - + @@ -334,22 +329,15 @@ END - $Lang::tr{'tor do not advertise relay'}: + $Lang::tr{'tor relay port'}: - - - - - $Lang::tr{'tor relay nickname'}: * - - + - $Lang::tr{'tor contact info'}: * - + @@ -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 021682f70..a0c426f3f 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 2e04c468d..b12ae7d2e 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', -- 2.39.2