From 0830129a3c5065be7d3af416de16481f2d5a612f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 31 Jul 2013 19:20:42 +0200 Subject: [PATCH] WUI: Add Tor menu entry. --- config/menu/EX-tor.menu | 6 ++++++ config/rootfiles/common/configroot | 1 + config/rootfiles/packages/tor | 3 ++- 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 ++++ langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 12 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 config/menu/EX-tor.menu diff --git a/config/menu/EX-tor.menu b/config/menu/EX-tor.menu new file mode 100644 index 000000000..00ddffe8d --- /dev/null +++ b/config/menu/EX-tor.menu @@ -0,0 +1,6 @@ +$subipfire->{'50.tor'} = { + 'caption' => $Lang::tr{'tor'}, + 'uri' => '/cgi-bin/tor.cgi', + 'title' => $Lang::tr{'tor'}, + 'enabled' => 1, +}; diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index cd33ec496..8965ff70e 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -91,6 +91,7 @@ var/ipfire/menu.d/70-log.menu #var/ipfire/menu.d/EX-imspector.menu #var/ipfire/menu.d/EX-mpfire.menu #var/ipfire/menu.d/EX-samba.menu +#var/ipfire/menu.d/EX-tor.menu #var/ipfire/menu.d/EX-tripwire.menu #var/ipfire/menu.d/EX-wlanap.menu var/ipfire/modem diff --git a/config/rootfiles/packages/tor b/config/rootfiles/packages/tor index e670be2d5..1861f4f49 100644 --- a/config/rootfiles/packages/tor +++ b/config/rootfiles/packages/tor @@ -4,6 +4,7 @@ etc/rc.d/init.d/tor #etc/tor etc/tor/tor-tsocks.conf etc/tor/torrc +srv/web/ipfire/cgi-bin/tor.cgi usr/bin/tor usr/bin/tor-gencert usr/bin/tor-resolve @@ -22,7 +23,7 @@ usr/share/tor usr/share/tor/defaults-torrc usr/share/tor/geoip var/ipfire/backup/addons/includes/tor -srv/web/ipfire/cgi-bin/tor.cgi +var/ipfire/menu.d/EX-tor.menu var/ipfire/tor var/ipfire/tor/settings var/ipfire/tor/torrc diff --git a/doc/language_issues.es b/doc/language_issues.es index 7756f2644..8adc0f4ef 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -625,6 +625,7 @@ WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes WARNING: untranslated string: tor accounting bytes left diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 21fa1ad17..b5361a7b4 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -610,6 +610,7 @@ WARNING: untranslated string: server restart WARNING: untranslated string: snort working WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes WARNING: untranslated string: tor accounting bytes left diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 3a8f682b5..febebf9d1 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -527,6 +527,7 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes WARNING: untranslated string: tor accounting bytes left diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 7756f2644..8adc0f4ef 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -625,6 +625,7 @@ WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes WARNING: untranslated string: tor accounting bytes left diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 324c47720..47c2da477 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -590,6 +590,7 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: static routes +WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes WARNING: untranslated string: tor accounting bytes left diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 31a18c92a..6679e73b3 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -523,6 +523,7 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: tor WARNING: untranslated string: tor accounting WARNING: untranslated string: tor accounting bytes WARNING: untranslated string: tor accounting bytes left diff --git a/doc/language_missings b/doc/language_missings index e47da816f..a9fa8756e 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -116,6 +116,7 @@ < snort working < static routes < system information +< tor < tor accounting < tor accounting bytes < tor accounting bytes left @@ -346,6 +347,7 @@ < Set time on boot < static routes < system information +< tor < tor accounting < tor accounting bytes < tor accounting bytes left @@ -528,6 +530,7 @@ < qos enter bandwidths < server restart < static routes +< tor < tor accounting < tor accounting bytes < tor accounting bytes left @@ -715,6 +718,7 @@ < qos enter bandwidths < server restart < static routes +< tor < tor accounting < tor accounting bytes < tor accounting bytes left diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 848aaefa2..a21f75ab3 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1797,6 +1797,7 @@ 'tone' => 'Ton', 'tone dial' => 'Tonwahl:', 'too long 80 char max' => ' ist zu lang, es sind maximal 80 Zeichen erlaubt', +'tor' => 'Tor', 'tor accounting' => 'Accounting', 'tor accounting bytes' => 'Traffic (empfangen/gesendet)', 'tor accounting bytes left' => 'übrig', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 150411a4a..b16ecbf84 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1831,6 +1831,7 @@ 'tone' => 'Tone', 'tone dial' => 'Tone dial:', 'too long 80 char max' => ' is too long, maximum allowed is 80 characters', +'tor' => 'Tor', 'tor accounting' => 'Accounting', 'tor accounting bytes' => 'Traffic (read/written)', 'tor accounting bytes left' => 'left', -- 2.39.2