tor-commits October 2014

tor-commits@lists.torproject.org

26 participants
1551 discussions

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 05 Oct '14

05 Oct '14

commit 0f5ede23cc724f7edbeeca630309f1358fa9fea7 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 5 23:45:02 2014 +0000 Update translations for bridgedb --- cs/LC_MESSAGES/bridgedb.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cs/LC_MESSAGES/bridgedb.po b/cs/LC_MESSAGES/bridgedb.po index 11f1913..87344fe 100644 --- a/cs/LC_MESSAGES/bridgedb.po +++ b/cs/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# A5h8d0wf0x <littleslyfoxie28(a)gmail.com>, 2014 # Adam Slovacek <adamslovacek(a)gmail.com>, 2013 # Elisa <valhalla(a)gishpuppy.com>, 2011 # Sanky <gsanky+transifex(a)gmail.com>, 2011 @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-09-13 23:49+0000\n" -"Last-Translator: Jiří Vírava <appukonrad(a)gmail.com>\n" +"PO-Revision-Date: 2014-10-05 23:42+0000\n" +"Last-Translator: A5h8d0wf0x <littleslyfoxie28(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/projects/p/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,7 +38,7 @@ msgstr "" #. "Tor Browser" #: lib/bridgedb/HTTPServer.py:121 msgid "Sorry! Something went wrong with your request." -msgstr "" +msgstr "Promiňte! Něco se stalo špatně s vaším požadavkem." #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" @@ -45,7 +46,7 @@ msgstr "[Toto je automatická zpráva; prosím, neodpovídejte na ni]" #: lib/bridgedb/strings.py:20 msgid "Here are your bridges:" -msgstr "" +msgstr "Zde jsou vaše mosty:" #: lib/bridgedb/strings.py:22 #, python-format

1 0

r26968: {website} Remove nicknames from website doc (website/trunk/docs/en)
by Sebastian Hahn 05 Oct '14

05 Oct '14

Author: sebastian Date: 2014-10-05 18:13:54 +0000 (Sun, 05 Oct 2014) New Revision: 26968 Modified: website/trunk/docs/en/faq.wml Log: Remove nicknames from website doc Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2014-10-04 02:14:32 UTC (rev 26967) +++ website/trunk/docs/en/faq.wml 2014-10-05 18:13:54 UTC (rev 26968) @@ -1996,8 +1996,8 @@ href="https://secure.wikimedia.org/wikipedia/en/wiki/ISO_3166-1_alpha-2" >2 letter ISO3166 country code</a> in curly braces (for example <tt>{de}</tt>), - or an ip address pattern (for example 255.254.0.0/8), or a node - nickname. Make sure there are no spaces between the commas and the + or an ip address pattern (for example 255.254.0.0/8). + Make sure there are no spaces between the commas and the list items. </p> <p> @@ -2810,9 +2810,8 @@ <p> When upgrading your Tor relay, or running it on a different computer, - the important part is to keep the same nickname (defined in your torrc - file) and the same identity key (stored in "keys/secret_id_key" in - your DataDirectory). + the important part is to keep the same identity key (stored in + "keys/secret_id_key" in your DataDirectory). </p> <p> This means that if you're upgrading your Tor relay and you keep the same @@ -2948,10 +2947,7 @@ <p> where each fingerprint is the 40 character identity fingerprint (without -spaces). You can also list them by nickname, but fingerprint is safer. -Be -sure to prefix the digest strings with a dollar sign ('$') so that the -digest is not confused with a nickname in the config file. +spaces). </p> <p>

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 05 Oct '14

05 Oct '14

commit 0a043c6b6f8aaa895917fb99af0ab33f140bbe07 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 5 12:16:12 2014 +0000 Update translations for torbutton-torbuttonproperties --- ko/torbutton.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ko/torbutton.properties b/ko/torbutton.properties index c8f16d1..03ce18a 100644 --- a/ko/torbutton.properties +++ b/ko/torbutton.properties @@ -49,9 +49,9 @@ torbutton.popup.never_ask_again = 다시는 물어보지 않기 # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now +canvas.notNow=지금은 하지 않겠습니다 canvas.notNowAccessKey=N -canvas.allow=Allow in the future +canvas.allow=다음에 허용함 canvas.allowAccessKey=A -canvas.never=Never for this site (recommended) +canvas.never=이 사이트에는 영원히 않음 (권장) canvas.neverAccessKey=e

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 05 Oct '14

05 Oct '14

commit 9720b171b993edb41bfd42f99499dfaa64aaa44f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 5 12:15:47 2014 +0000 Update translations for tor-launcher-properties --- ko/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ko/torlauncher.properties b/ko/torlauncher.properties index 0792dde..5ebf2d7 100644 --- a/ko/torlauncher.properties +++ b/ko/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tor 브라우저 Launcher -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited=Tor가 예기치 않게 종료되었습니다. 이것은 Tor 자체의 오류, 사용자 시스템의 타 프로그램 또는 하드웨어의 오류 때문일 수 있습니다. 사용자가 Tor를 재시작 하기 전까진, Tor 브라우저는 어떠한 웹사이트에 접속하지 않습니다. 문제가 계속된다면, 지원팀에게 당신의 Tor 로그를 보내주십시오. +torlauncher.tor_exited2=Tor를 재시작해도 브라우저 탭은 닫히지 않음. torlauncher.tor_controlconn_failed=Tor 제어 포트에 연결이 어렵습니다. torlauncher.tor_failed_to_start=Tor 시작 실패. torlauncher.tor_control_failed=Tor 제어에 실패했습니다.

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 05 Oct '14

05 Oct '14

commit 85c1d8de9beaa8833e0cf110028557b7972c4af9 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 5 12:15:36 2014 +0000 Update translations for tails-greeter_completed --- ko/ko.po | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/ko/ko.po b/ko/ko.po index 4e060f4..c08df49 100644 --- a/ko/ko.po +++ b/ko/ko.po @@ -3,15 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# stevegrey <91.ragi(a)gmail.com>, 2014 # ilbe123 <a3057016(a)drdrb.net>, 2014 +# Jamin <bakzaa(a)gmail.com>, 2014 # Dr.what <javrick6(a)naver.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-14 13:14+0200\n" -"PO-Revision-Date: 2014-05-17 14:36+0000\n" -"Last-Translator: ilbe123 <a3057016(a)drdrb.net>\n" +"POT-Creation-Date: 2014-08-31 10:36+0200\n" +"PO-Revision-Date: 2014-10-05 12:00+0000\n" +"Last-Translator: Jamin <bakzaa(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -103,13 +105,13 @@ msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\"> #: ../glade/optionswindow.glade.h:12 msgid "" -"This option makes Tails look more like Microsoft Windows XP. This may be " +"This option makes Tails look more like Microsoft Windows 8. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "이 옵션은 Tails을 더 Microsoft Windows XP로 보이게합니다. 이것은주의를 끄는 의심을 피하기 위해 공공 장소 같은 곳에서 유용 할 수 있습니다." +msgstr "본 설정은 Tails가 보다 마이크로소프트 Windows 8처럼 보이게 만들어줄 것입니다. 이 기능은 공공장소에서 의심을 피할때 유용할 것입니다." #: ../glade/optionswindow.glade.h:13 -msgid "Activate Microsoft Windows XP Camouflage" -msgstr "Microsoft Windows XP 위장을 활성화" +msgid "Activate Microsoft Windows 8 Camouflage" +msgstr "Microsoft Windows 8 카모플라주 활성화" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing" @@ -198,7 +200,7 @@ msgid "" "%(stderr)s" msgstr "live-persist가 실패했습니다. 반환 코드는 %(returncode)s:\n%(stdout)s\n%(stderr)s" -#: ../tailsgreeter/langpanel.py:125 ../tailsgreeter/langpanel.py:152 -#: ../tailsgreeter/langpanel.py:185 +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 msgid "Other..." msgstr "기타..."

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 05 Oct '14

05 Oct '14

commit cf2f355ad78c032a927cd676a83ab932fc40c8d4 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 5 12:15:32 2014 +0000 Update translations for tails-greeter --- ko/ko.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ko/ko.po b/ko/ko.po index 0617594..c08df49 100644 --- a/ko/ko.po +++ b/ko/ko.po @@ -5,14 +5,15 @@ # Translators: # stevegrey <91.ragi(a)gmail.com>, 2014 # ilbe123 <a3057016(a)drdrb.net>, 2014 +# Jamin <bakzaa(a)gmail.com>, 2014 # Dr.what <javrick6(a)naver.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-20 18:36+0200\n" -"PO-Revision-Date: 2014-07-29 01:30+0000\n" -"Last-Translator: stevegrey <91.ragi(a)gmail.com>\n" +"POT-Creation-Date: 2014-08-31 10:36+0200\n" +"PO-Revision-Date: 2014-10-05 12:00+0000\n" +"Last-Translator: Jamin <bakzaa(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -106,7 +107,7 @@ msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\"> msgid "" "This option makes Tails look more like Microsoft Windows 8. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "" +msgstr "본 설정은 Tails가 보다 마이크로소프트 Windows 8처럼 보이게 만들어줄 것입니다. 이 기능은 공공장소에서 의심을 피할때 유용할 것입니다." #: ../glade/optionswindow.glade.h:13 msgid "Activate Microsoft Windows 8 Camouflage"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 05 Oct '14

05 Oct '14

commit 4a49cce49a28417038df85a22dce5a333d7079bf Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 5 12:15:02 2014 +0000 Update translations for bridgedb --- ko/LC_MESSAGES/bridgedb.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po index bdcd977..0d82528 100644 --- a/ko/LC_MESSAGES/bridgedb.po +++ b/ko/LC_MESSAGES/bridgedb.po @@ -5,6 +5,7 @@ # Translators: # ilbe123 <a3057016(a)drdrb.net>, 2014 # cwt96 <cwt967(a)naver.com>, 2012 +# Jamin <bakzaa(a)gmail.com>, 2014 # Dr.what <javrick6(a)naver.com>, 2014 # pCsOrI <pcsori(a)gmail.com>, 2012 # Sam Ryoo <samryoo(a)gmail.com>, 2014 @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-08-07 01:20+0000\n" -"Last-Translator: Sam Ryoo <samryoo(a)gmail.com>\n" +"PO-Revision-Date: 2014-10-05 12:10+0000\n" +"Last-Translator: Jamin <bakzaa(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -196,7 +197,7 @@ msgstr "당신의 브라우저는 사진을 정상적으로 불러오지 못합 #: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." -msgstr "" +msgstr "위 그림의 문자를 입력하십시오..." #: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" @@ -215,14 +216,14 @@ msgstr "" msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "" +msgstr "'Tor 네트워크 설정' 이라는 대화창이 뜨면, " #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "" +msgstr "당신의 인터넷 서비스 제공자(ISP)가 Tor 네트워크 접속을 차단 또는 검열하나요?" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:133 @@ -281,7 +282,7 @@ msgstr "연락하기" #. or for French: "Sacrebleu!". :) #: lib/bridgedb/templates/bridges.html:66 msgid "Uh oh, spaghettios!" -msgstr "" +msgstr "어머나, 뭔가 잘못되었습니다!" #: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." @@ -351,7 +352,7 @@ msgstr "없음" #: lib/bridgedb/templates/options.html:130 #, python-format msgid "%sY%ses!" -msgstr "" +msgstr "%s네!%s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks!

1 0

[ooni-probe/master] Fix type in README and manpage for oonideckgen.
by art＠torproject.org 05 Oct '14

05 Oct '14

commit 11efacdd42667631f2ac0bb4a9015ba58c3d13da Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Oct 5 13:56:35 2014 +0200 Fix type in README and manpage for oonideckgen. ooniresource is actually ooniresources. --- README.rst | 8 ++++---- data/oonideckgen.1 | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 7a0e749..1299276 100644 --- a/README.rst +++ b/README.rst @@ -67,7 +67,7 @@ To install it from the current master run:: The run:: mkdir my_decks - sudo ooniresource --update-inputs --update-geoip + sudo ooniresources --update-inputs --update-geoip oonideckgen -o my_decks/ The output from the last command will tell you how to run ooniprobe to perform @@ -180,7 +180,7 @@ To generate decks you will have to update the input resources of ooniprobe. This can be done with:: - ooniresource --update-inputs + ooniresources --update-inputs If you get a permission error, you may have to run the command as root or change the ooniprobe data directory inside of `ooniprobe.conf`. @@ -189,7 +189,7 @@ On some platforms, for example debian contrib, you will not get all the geoip related files needed. In that case it is possible to manually download them with ``ooniresources``:: - ooniresource --update-geoip + ooniresources --update-geoip Generating decks ---------------- @@ -199,7 +199,7 @@ You can generate decks for your country thanks to the oonideckgen command. If you wish, for example, to generate a deck to be run in the country of Italy, you can do so (be sure to have updated the input resources first) by running:: - oonideck --country-code IT --output ~/ + oonideckgen --country-code IT --output ~/ You will now have in your home a folder called `deck-it`, containing the ooni deck (ends with .deck) and the inputs. diff --git a/data/oonideckgen.1 b/data/oonideckgen.1 index 9406d98..f808165 100644 --- a/data/oonideckgen.1 +++ b/data/oonideckgen.1 @@ -75,7 +75,7 @@ This tools will generate a test deck that include the following tests: If deckgen is run with no arugment a geoip lookup is done on the IP of the user and that country is chosen. -In order to run deckgen you must have first have run ooniresource --update-inputs. +In order to run deckgen you must have first have run ooniresources --update-inputs. .sp .SH AUTHOR

1 0

[weather/master] Apply patch for #4071 by Matt Kraai (Thanks!): Remove newline
by kaner＠torproject.org 05 Oct '14

05 Oct '14

commit db65b00e3e5dcf010f988ec787dff18323668181 Author: Christian Fromme <kaner(a)strace.org> Date: Mon Jan 28 08:58:09 2013 +0100 Apply patch for #4071 by Matt Kraai (Thanks!): Remove newline --- weather/templates/base.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/weather/templates/base.html b/weather/templates/base.html index 81b8ba3..022af25 100644 --- a/weather/templates/base.html +++ b/weather/templates/base.html @@ -16,8 +16,7 @@ <div id="center"> <div id="banner"> <a href="https://www.torproject.org/"><img - src="/media/top-left.png" alt="Click to - go to home page" width="193" height="79" /></a> + src="/media/top-left.png" alt="Click to go to home page" width="193" height="79" /></a> <img src="/media/top-right.png" /> </div>

1 0

[weather/master] - Added a init.d style script to start/stop the listener process
by kaner＠torproject.org 05 Oct '14

05 Oct '14

commit 357efba19df13dd2c27dee3879c3173e0041b080 Author: Christian Fromme <kaner(a)strace.org> Date: Mon Nov 12 13:29:05 2012 +0100 - Added a init.d style script to start/stop the listener process - On Bahri, this script is used to restart the listener process once per week currently. This is necessary to work around some bug where Weather doesn't parse new consensuses anymore. - Fixed a typo in fingerprint_not_found.html (Thanks, arma) - Renamed the manager script from manage.py to weathercontrol.py. Names are important. ;-) --- weather/manage.py | 11 -- weather/scripts/weather | 153 ++++++++++++++++++++++++++ weather/templates/fingerprint_not_found.html | 2 +- weather/weathercontrol.py | 11 ++ 4 files changed, 165 insertions(+), 12 deletions(-) diff --git a/weather/manage.py b/weather/manage.py deleted file mode 100755 index bcdd55e..0000000 --- a/weather/manage.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/python -from django.core.management import execute_manager -try: - import settings # Assumed to be in the same directory. -except ImportError: - import sys - sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__) - sys.exit(1) - -if __name__ == "__main__": - execute_manager(settings) diff --git a/weather/scripts/weather b/weather/scripts/weather new file mode 100755 index 0000000..5119056 --- /dev/null +++ b/weather/scripts/weather @@ -0,0 +1,153 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: tor_weather +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Control The Tor Weather Listener Process +# Description: See Short-Description. +### END INIT INFO + +# Author: Christian Fromme <kaner(a)torproject.org> +# + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Tor Weather Daemon" +NAME=weathercontrol.py +DAEMON=/home/weather/opt/current/weather/$NAME +DAEMON_ARGS=" runlistener" +PIDFILE=/home/weather/var/run/$NAME.pid +SCRIPTNAME=/home/weather/bin/weather + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.2-14) to ensure that this file is present +# and status_of_proc is working. +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --start --quiet --chdir /home/weather/opt/current/weather --pidfile $PIDFILE --exec $DAEMON --make-pidfile --background --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --chdir /home/weather/opt/current/weather --pidfile $PIDFILE --exec $DAEMON --make-pidfile --background -- \ + $DAEMON_ARGS \ + || return 2 + # Add code here, if necessary, that waits for the process to be ready + # to handle requests from services started subsequently which depend + # on this one. As a last resort, sleep for some time. +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME + return 0 +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + #reload|force-reload) + # + # If do_reload() is not implemented then leave this commented out + # and leave 'force-reload' as an alias for 'restart'. + # + #log_daemon_msg "Reloading $DESC" "$NAME" + #do_reload + #log_end_msg $? + #;; + restart|force-reload) + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac + +: diff --git a/weather/templates/fingerprint_not_found.html b/weather/templates/fingerprint_not_found.html index f50e41f..b90d32c 100644 --- a/weather/templates/fingerprint_not_found.html +++ b/weather/templates/fingerprint_not_found.html @@ -14,7 +14,7 @@ <li>The fingerprint was entered incorrectly</li> <li>The node with the given fingerprint was set up within the last hour, in which case you should try to register again a bit later</li> <li>The node with the given fingerprint has been down for over a year</li> - <li>The node you are trying to monitor is running on a <em>very</em> out of date verion of Tor (version 0.1.0.5 or earlier) and doesn't publish its fingerprint to the directory authorities.</li> + <li>The node you are trying to monitor is running on a <em>very</em> out of date version of Tor (version 0.1.0.5 or earlier) and doesn't publish its fingerprint to the directory authorities.</li> </ul> </p> {% endblock %} diff --git a/weather/weathercontrol.py b/weather/weathercontrol.py new file mode 100755 index 0000000..bcdd55e --- /dev/null +++ b/weather/weathercontrol.py @@ -0,0 +1,11 @@ +#!/usr/bin/python +from django.core.management import execute_manager +try: + import settings # Assumed to be in the same directory. +except ImportError: + import sys + sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__) + sys.exit(1) + +if __name__ == "__main__": + execute_manager(settings)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2014