October 2019 - tor-commits - lists.torproject.org

[metrics-cloud/master] monitor: Adds http commands with custom ports
by irl＠torproject.org 03 Oct '19

03 Oct '19

commit 263f3b097d3b7730da7ec561934644fd0424fec0 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Oct 3 11:56:16 2019 +0100 monitor: Adds http commands with custom ports --- ansible/roles/metrics-monitor/files/http_commands.cfg | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ansible/roles/metrics-monitor/files/http_commands.cfg b/ansible/roles/metrics-monitor/files/http_commands.cfg index ecf4b46..ae455b7 100644 --- a/ansible/roles/metrics-monitor/files/http_commands.cfg +++ b/ansible/roles/metrics-monitor/files/http_commands.cfg @@ -4,7 +4,16 @@ define command{ } define command{ + command_name check_https_url_content_port + command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -u '$ARG1$' -s '$ARG2$' -p '$ARG3$' +} + +define command{ command_name check_http_redirect command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -e 'HTTP/1.1 301' -u '/' -d 'Location: https:' } +define command { + command_name check_https_cert_expiry + command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -C 10,3 -p '$ARG1$' +}

1 0

[metrics-cloud/master] onionperf: We are not using Ansible for these yet
by irl＠torproject.org 03 Oct '19

03 Oct '19

commit 8d7c2d2808b74963071ceba534917272b13ad88f Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Oct 3 11:55:42 2019 +0100 onionperf: We are not using Ansible for these yet --- ansible/production | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/production b/ansible/production index ccf011f..0d95d23 100644 --- a/ansible/production +++ b/ansible/production @@ -1,8 +1,8 @@ [onionperfs] -op-ab.onionperf.torproject.net -op-hk.onionperf.torproject.net -op-nl.onionperf.torproject.net -op-us.onionperf.torproject.net +#op-ab.onionperf.torproject.net +#op-hk.onionperf.torproject.net +#op-nl.onionperf.torproject.net +#op-us.onionperf.torproject.net [monitors] 54.196.58.240

1 0

[metrics-cloud/master] monitor: Use Debian 10 AMI
by irl＠torproject.org 03 Oct '19

03 Oct '19

commit d923cd510dc780e21a2d0394ed221e42d64293c9 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Oct 3 11:55:08 2019 +0100 monitor: Use Debian 10 AMI --- cloudformation/metrics-monitor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudformation/metrics-monitor.yml b/cloudformation/metrics-monitor.yml index 5ee6282..0f1842d 100644 --- a/cloudformation/metrics-monitor.yml +++ b/cloudformation/metrics-monitor.yml @@ -8,7 +8,7 @@ Resources: Type: AWS::EC2::Instance Properties: AvailabilityZone: us-east-1a - ImageId: ami-0bd9223868b4778d7 + ImageId: ami-01db78123b2b99496 InstanceType: t2.micro SubnetId: Fn::ImportValue: !Sub 'MetricsSubnet'

1 0

[metrics-cloud/master] monitor: New production host deployed
by irl＠torproject.org 03 Oct '19

03 Oct '19

commit 9de6148cce93b1816915ef1d4a71d5fb67f87c76 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Oct 3 11:55:53 2019 +0100 monitor: New production host deployed --- ansible/production | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/production b/ansible/production index 0d95d23..6aace22 100644 --- a/ansible/production +++ b/ansible/production @@ -5,4 +5,4 @@ #op-us.onionperf.torproject.net [monitors] -54.196.58.240 +3.92.143.52

1 0

[metrics-cloud/master] monitor: Monitor OnionPerf instances
by irl＠torproject.org 03 Oct '19

03 Oct '19

commit f9fac2635993409c3f75931651dc72c1d0184dd7 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Oct 3 11:33:57 2019 +0100 monitor: Monitor OnionPerf instances --- ansible/monitors.yml | 2 +- ansible/roles/metrics-monitor/files/collector.cfg | 21 +----- ansible/roles/metrics-monitor/files/common.cfg | 18 +++++ ansible/roles/metrics-monitor/files/onionperf.cfg | 82 +++++++++++++++++++++++ 4 files changed, 103 insertions(+), 20 deletions(-) diff --git a/ansible/monitors.yml b/ansible/monitors.yml index 8bca27f..519c6a6 100644 --- a/ansible/monitors.yml +++ b/ansible/monitors.yml @@ -34,7 +34,7 @@ - rsync - name: copy nagios configuration synchronize: - src: conf.d/ + src: roles/metrics-monitor/files/ dest: /etc/nagios4/conf.d delete: yes recursive: yes diff --git a/ansible/roles/metrics-monitor/files/collector.cfg b/ansible/roles/metrics-monitor/files/collector.cfg index ec046d3..2878301 100644 --- a/ansible/roles/metrics-monitor/files/collector.cfg +++ b/ansible/roles/metrics-monitor/files/collector.cfg @@ -4,6 +4,7 @@ define host{ alias Primary CollecTor instance address collector.torproject.org hostgroups collectors,collector-bridgedescs,collector-archives + check_command check_http } define host{ @@ -12,6 +13,7 @@ define host{ alias Secondary CollecTor instance address collector2.torproject.org hostgroups collectors + check_command check_http } define hostgroup{ @@ -32,25 +34,6 @@ define hostgroup{ define service{ use generic-service hostgroup_name collectors - service_description ICMPv4 Echo - check_command check_ping_4!200.0,20%!600.0,60% ; The command used to monitor the service - check_interval 5 ; Check the service every 5 minutes under normal conditions - retry_interval 1 ; Re-check the service every minute until its final/hard state is determined - } - -# AWS doesn't have IPv6 -#define service{ -# use generic-service -# hostgroup_name collectors -# service_description ICMPv6 Echo -# check_command check_ping!200.0,20%!600.0,60% -6 ; The command used to monitor the service -# check_interval 5 ; Check the service every 5 minutes under normal conditions -# retry_interval 1 ; Re-check the service every minute until its final/hard state is determined -# } - -define service{ - use generic-service - hostgroup_name collectors service_description HTTP Redirect check_command check_http_redirect check_interval 5 ; Check the service every 5 minutes under normal conditions diff --git a/ansible/roles/metrics-monitor/files/common.cfg b/ansible/roles/metrics-monitor/files/common.cfg new file mode 100644 index 0000000..9d4ee0b --- /dev/null +++ b/ansible/roles/metrics-monitor/files/common.cfg @@ -0,0 +1,18 @@ +define service{ + use generic-service + hostgroup_name collectors,onionperfs + service_description ICMPv4 Echo + check_command check_ping_4!200.0,20%!600.0,60% ; The command used to monitor the service + check_interval 5 ; Check the service every 5 minutes under normal conditions + retry_interval 1 ; Re-check the service every minute until its final/hard state is determined + } + +# AWS doesn't have IPv6 +#define service{ +# use generic-service +# hostgroup_name collectors +# service_description ICMPv6 Echo +# check_command check_ping!200.0,20%!600.0,60% -6 ; The command used to monitor the service +# check_interval 5 ; Check the service every 5 minutes under normal conditions +# retry_interval 1 ; Re-check the service every minute until its final/hard state is determined +# } diff --git a/ansible/roles/metrics-monitor/files/onionperf.cfg b/ansible/roles/metrics-monitor/files/onionperf.cfg new file mode 100644 index 0000000..40d9ff5 --- /dev/null +++ b/ansible/roles/metrics-monitor/files/onionperf.cfg @@ -0,0 +1,82 @@ +define host{ + use linux-server + host_name op-ab.onionperf.torproject.net + alias OnionPerf Scotland + address op-ab.onionperf.torproject.net + hostgroups onionperfs,onionperfs-newport + } + +define host{ + use linux-server + host_name op-us.onionperf.torproject.net + alias OnionPerf US East + address op-us.onionperf.torproject.net + hostgroups onionperfs,onionperfs-oldport + } + +define host{ + use linux-server + host_name op-nl.onionperf.torproject.net + alias OnionPerf Netherlands + address op-nl.onionperf.torproject.net + hostgroups onionperfs,onionperfs-oldport + } + +define host{ + use linux-server + host_name op-hk.onionperf.torproject.net + alias OnionPerf Hong Kong + address op-hk.onionperf.torproject.net + hostgroups onionperfs,onionperfs-oldport + } + +define hostgroup{ + hostgroup_name onionperfs + alias OnionPerf Instances + } + +define hostgroup{ + hostgroup_name onionperfs-oldport + alias OnionPerf Instances Old Ports + } + +define hostgroup{ + hostgroup_name onionperfs-newport + alias OnionPerf Instances New Ports + } + +define service{ + use generic-service + hostgroup_name onionperfs-oldport + service_description Root index page + check_command check_https_url_content!/!Directory listing for + check_interval 15 ; Check the service every 5 minutes under normal conditions + retry_interval 1 ; Re-check the service every minute until its final/hard state is determined + } + +define service{ + use generic-service + hostgroup_name onionperfs-newport + service_description Root index page + check_command check_https_url_content_port!/!Directory listing for!8443 + check_interval 15 ; Check the service every 5 minutes under normal conditions + retry_interval 1 ; Re-check the service every minute until its final/hard state is determined + } + +define service { + use generic-service + hostgroup_name onionperfs-oldport + service_description HTTPS Cert Expiry + check_command check_https_cert_expiry!443 + check_interval 30 + retry_interval 30 +} + +define service { + use generic-service + hostgroup_name onionperfs-newport + service_description HTTPS Cert Expiry + check_command check_https_cert_expiry!8443 + check_interval 30 + retry_interval 30 +}

1 0

[metrics-cloud/master] monitor: Use SNS notification commands
by irl＠torproject.org 03 Oct '19

03 Oct '19

commit 40fa1252483872813eed715ce3d68989a2fabc42 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Oct 3 11:32:54 2019 +0100 monitor: Use SNS notification commands --- ansible/roles/metrics-monitor/files/sns.cfg | 19 +++++++++++++++++++ cloudformation/metrics-monitor.yml | 16 +++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/ansible/roles/metrics-monitor/files/sns.cfg b/ansible/roles/metrics-monitor/files/sns.cfg new file mode 100644 index 0000000..1037ffe --- /dev/null +++ b/ansible/roles/metrics-monitor/files/sns.cfg @@ -0,0 +1,19 @@ +define contact { + use generic-contact + contact_name metrics-team + service_notification_commands notify-service-by-sns + host_notification_commands notify-host-by-sns +} + +# 'notify-host-by-sns' command definition +define command{ + command_name notify-host-by-sns + command_line aws --region "us-east-1" sns publish --topic-arn `aws --region "us-east-1" cloudformation describe-stack-resources --stack-name metrics-monitor-hack | jq -r '.StackResources[] | select(.ResourceType == "AWS::SNS::Topic") | .PhysicalResourceId'` --subject "** $NOTIFICATIONTYPE$ Host Alert: $HOSTNAME$ is $HOSTSTATE$ **" --message "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" + } + +# 'notify-service-by-sns' command definition +define command{ + command_name notify-service-by-sns + command_line + command_line aws --region "us-east-1" sns publish --topic-arn `aws --region "us-east-1" cloudformation describe-stack-resources --stack-name metrics-monitor-hack | jq -r '.StackResources[] | select(.ResourceType == "AWS::SNS::Topic") | .PhysicalResourceId'` --subject "$NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$" --message "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$\n" + } diff --git a/cloudformation/metrics-monitor.yml b/cloudformation/metrics-monitor.yml index 39c9896..5ee6282 100644 --- a/cloudformation/metrics-monitor.yml +++ b/cloudformation/metrics-monitor.yml @@ -1,5 +1,5 @@ --- -# CloudFormation Stack for Tor Metrics Operational Monitoring +# CloudFormation Stack for Hacky Tor Metrics Operational Monitoring # This stack will only deploy on us-east-1 and will deploy in the metrics VPC # aws cloudformation deploy --region us-east-1 --stack-name metrics-monitor --template-file metrics-monitor.yml --capabilities CAPABILITY_IAM AWSTemplateFormatVersion: 2010-09-09 @@ -17,6 +17,8 @@ Resources: SecurityGroupIds: - Fn::ImportValue: !Sub 'MetricsInternetSecurityGroup' - Fn::ImportValue: !Sub 'MetricsPingableSecurityGroup' + - Fn::ImportValue: !Sub 'MetricsHTTPSecurityGroup' + - Fn::ImportValue: !Sub 'MetricsHTTPSSecurityGroup' AlertContact: Type: AWS::SNS::Topic Properties: @@ -55,3 +57,15 @@ Resources: Version: '2012-10-17' Roles: - !Ref AlerterRole + AlerterQueryPolicy: + Type: AWS::IAM::Policy + Properties: + PolicyName: AlertQueryPolicy + PolicyDocument: + Statement: + - Action: cloudformation:DescribeStackResources + Effect: Allow + Resource: !Ref AWS::StackId + Version: '2012-10-17' + Roles: + - !Ref AlerterRole

1 0

[metrics-cloud/master] monitor: Import bushel Nagios plugins config
by irl＠torproject.org 03 Oct '19

03 Oct '19

commit 405ed24ab5a30cd0fd30d1aec8908ecc996b82a9 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Oct 3 11:33:21 2019 +0100 monitor: Import bushel Nagios plugins config --- .../metrics-monitor/files/bushel_commands.cfg | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/ansible/roles/metrics-monitor/files/bushel_commands.cfg b/ansible/roles/metrics-monitor/files/bushel_commands.cfg new file mode 100644 index 0000000..26087fe --- /dev/null +++ b/ansible/roles/metrics-monitor/files/bushel_commands.cfg @@ -0,0 +1,25 @@ +# This is an example Nagios configuration file that contains definitions of +# commands using the plugins included in the bushel distribution. +# +# This can be directly included in your configuration, or may be modified to +# suit your requirements. + +define command{ + command_name check_collector_index_created + command_line /usr/lib/bushel/nagios-plugins/check_collector '$HOSTADDRESS$' index +} + +define command{ + command_name check_collector_latest_recent_bridgedescs + command_line /usr/lib/bushel/nagios-plugins/check_collector '$HOSTADDRESS$' bridgedescs +} + +define command{ + command_name check_collector_latest_recent_exitlists + command_line /usr/lib/bushel/nagios-plugins/check_collector '$HOSTADDRESS$' exitlists +} + +define command{ + command_name check_collector_latest_recent_relaydescs + command_line /usr/lib/bushel/nagios-plugins/check_collector '$HOSTADDRESS$' relaydescs +}

1 0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation＠torproject.org 03 Oct '19

03 Oct '19

commit 0b9f2bcd9bd66103138117ff168536ceee96c5d0 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 3 10:16:58 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+ru.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code_of_conduct+ru.po b/code_of_conduct+ru.po index e8737ec5e..ae1d06b86 100644 --- a/code_of_conduct+ru.po +++ b/code_of_conduct+ru.po @@ -515,6 +515,9 @@ msgid "" "expected to comply immediately. Please don't step in on someone else's " "behalf without their consent." msgstr "" +"Любой, кого другой член сообщества попросил прекратить неприемлемое " +"поведение, должен немедленно подчиниться. Пожалуйста, не вмешивайтесь в их " +"защиту без их согласия." #. type: Plain text #: ../code_of_conduct.txt:195

1 0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation＠torproject.org 03 Oct '19

03 Oct '19

commit e2d4f78e909f76d81489e81b5fff76c4c5c82c98 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 3 09:46:51 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+ru.po | 704 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 704 insertions(+) diff --git a/code_of_conduct+ru.po b/code_of_conduct+ru.po new file mode 100644 index 000000000..e8737ec5e --- /dev/null +++ b/code_of_conduct+ru.po @@ -0,0 +1,704 @@ +# Code of conduct of the tor project +# Copyright (C) 2019 tor project. +# This Code of Conduct is licensed under a Creative Commons CC-BY-SA 4.0 +# International license.e. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +# Translators: +# kookieonarope <cloudtwelve(a)waifu.club>, 2019 +# diana azaryan <dianazryn(a)gmail.com>, 2019 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: Code of conduct of the Tor Project\n" +"POT-Creation-Date: 2019-08-02 12:00+0000\n" +"PO-Revision-Date: 2019-08-27 18:54+0000\n" +"Last-Translator: diana azaryan <dianazryn(a)gmail.com>, 2019\n" +"Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ru\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" + +#. type: Plain text +#: ../code_of_conduct.txt:1 ../code_of_conduct.txt:24 +#: ../code_of_conduct.txt:51 ../code_of_conduct.txt:75 +#: ../code_of_conduct.txt:104 ../code_of_conduct.txt:180 +#: ../code_of_conduct.txt:193 ../code_of_conduct.txt:213 +#: ../code_of_conduct.txt:231 ../code_of_conduct.txt:243 +#: ../code_of_conduct.txt:253 ../code_of_conduct.txt:278 +#, no-wrap +msgid "============================================================\n" +msgstr "============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:3 +#, no-wrap +msgid "" +"Tor Project Code of Conduct\n" +"============================================================\n" +msgstr "" +"Кодекс Поведения Tor Project\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:6 +msgid "Statement of Intent:" +msgstr "Изложение намерений:" + +#. type: Plain text +#: ../code_of_conduct.txt:10 +msgid "" +"The Tor Project is committed to fostering an inclusive environment and " +"community. Tor is a place where people should feel safe to engage, share " +"their point of view, and participate." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:15 +msgid "" +"This code of conduct applies to The Tor Project as a whole. It is intended " +"to provide guidelines for contributors. Employees and contractors of The Tor" +" Project, Inc. (TPI) are also subject to company policies and procedures. " +"Those people should feel free to contact HR with questions or concerns." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:23 +msgid "" +"This code of conduct is not exhaustive or complete. It is an ongoing effort " +"to summarize our shared understanding. We want to provide a welcoming, safe " +"environment, so we can work together to pursue powerful solutions. We " +"reserve the right to deviate from strictly enforcing this code. Any " +"deviations must produce an outcome which is fairer, and aligned with our " +"values. We understand that keeping a living document relevant and “patched” " +"involves sustained effort." +msgstr "" +"Настоящий Кодекс поведения не является исчерпывающим или полным. Это " +"постоянные усилия по обобщению нашего общего понимания. Мы хотим обеспечить " +"гостеприимную, безопасную окружающую среду, чтобы мы могли работать " +"совместно для достижения мощных решений. Мы оставляем за собой право " +"отклоняться от строгого соблюдения настоящего Кодекса. Любые отклонения " +"должны привести к результату, который является более справедливым и " +"соответствует нашим ценностям. Мы понимаем, что поддержание живого документа" +" актуальным и ”исправленным\" требует постоянных усилий." + +#. type: Plain text +#: ../code_of_conduct.txt:26 +#, no-wrap +msgid "" +"0. Summary: Don't be a jerk. Be awesome instead.\n" +"============================================================\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:29 +msgid "The Tor community should be a good place where people are glad to be." +msgstr "" +"Tor-сообщество должно быть хорошим местом, в котором люди рады находиться." + +#. type: Plain text +#: ../code_of_conduct.txt:31 +#, no-wrap +msgid " DO: Be kind, thoughtful, and considerate.\n" +msgstr " МОЖНО: Будьте добрыми, заботливыми и внимательными.\n" + +#. type: Plain text +#: ../code_of_conduct.txt:33 +#, no-wrap +msgid " DO: Make Tor a place where people are happy and comfortable.\n" +msgstr " МОЖНО: Превратите Tor в место, где люди счастливы и им комфортно.\n" + +#. type: Plain text +#: ../code_of_conduct.txt:36 +#, no-wrap +msgid "" +" DO: Remember: We are all contributing; we are all learning. Nobody was born\n" +" an expert.\n" +msgstr "" +" МОЖНО: Помните: Мы все вносим свой вклад; мы все учимся. Никто не родился\n" +" экспертом.\n" + +#. type: Plain text +#: ../code_of_conduct.txt:38 +#, no-wrap +msgid " DO: Yield the floor. Listen. Make sure everyone gets heard.\n" +msgstr "" +"МОЖНО: Давайте другим слово. Слушайте. Позаботьтесь о том, что бы каждый был" +" услышен.\n" + +#. type: Plain text +#: ../code_of_conduct.txt:40 +#, no-wrap +msgid " DON'T: Insult, harass, intimidate, or be a jerk.\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:43 +#, no-wrap +msgid "" +" DON'T: Treat honest mistakes as an excuse to hassle people. Mistakes are for\n" +" learning.\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:46 +#, no-wrap +msgid "" +" DON'T: Hunt for ways to uphold the letter of this code while violating its\n" +" spirit.\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:50 +#, no-wrap +msgid "" +" AND DO: Eagerly email: tor-community-council(a)lists.torproject.org with\n" +" questions or concerns. Public key:\n" +" https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:53 +#, no-wrap +msgid "" +"1. Purpose\n" +"============================================================\n" +msgstr "" +"1. Цель\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:63 +msgid "" +"A primary goal of the Tor community is to be inclusive of many different " +"contributors. We want to include contributors from the most varied and " +"diverse backgrounds possible. As such, we are committed to providing a " +"friendly, safe and welcoming environment for all, regardless of their " +"experience, gender identity or expression, sexual orientation, family, " +"relationships, ability (whether bodily or mental), personal appearance, " +"socioeconomic status, body size, race, ethnicity, age, religion, " +"nationality, or membership in a disadvantaged and/or underrepresented group." +msgstr "" +"Основная цель сообщества Tor - охватить множество различных участников. Мы " +"хотим включить участников из самых разных и многоообразных слоев общества. " +"Таким образом, мы стремимся обеспечить дружественную, безопасную и " +"гостеприимную среду для всех, независимо от их опыта, гендерной идентичности" +" или самовыражения, сексуальной ориентации, семьи, отношений, способностей " +"(физических или психических), внешнего вида, социально-экономического " +"статуса, размера тела, расы, этнической принадлежности, возраста, религии, " +"национальности или принадлежности к неблагополучной и/или недопредставленной" +" группе." + +#. type: Plain text +#: ../code_of_conduct.txt:68 +msgid "" +"A safe environment means one free from abuse, whether isolated or systemic. " +"We explicitly acknowledge that tolerating abuse is a security problem. " +"Allowing abusers and malicious people to disrupt our community puts our " +"software, developers, and users at risk." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:71 +msgid "" +"This code of conduct outlines our expectations for all those who participate" +" in our community, as well as the consequences for unacceptable behavior." +msgstr "" +"Данный Кодекс поведения определяет наши ожидания для всех тех, кто участвует" +" в нашем сообществе, а также последствия для неприемлемого поведения." + +#. type: Plain text +#: ../code_of_conduct.txt:74 +msgid "" +"We invite all those who participate in The Tor Project to help us create " +"safe and positive experiences for everyone." +msgstr "" +"Мы приглашаем всех, кто участвует в The Tor Project, помочь нам создать " +"безопасный и позитивный опыт для всех." + +#. type: Plain text +#: ../code_of_conduct.txt:77 +#, no-wrap +msgid "" +"2. Be your best self\n" +"============================================================\n" +msgstr "" +"2. Будьте лучшей версией самого себя\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:80 +msgid "" +"The following behaviors are expected and requested of all community members:" +msgstr "" +"От всех членов сообщества ожидается и запрашивается следующее поведение:" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:83 +msgid "" +"Participate in an honest and active way. In doing so, you contribute to the " +"health and longevity of this community." +msgstr "" +"Участвуйте добросовестно и активно. Поступая таким образом, вы вносите свой " +"вклад в здоровье и долголетие этого сообщества." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:85 +msgid "Exercise consideration and respect in your speech and actions." +msgstr "Проявляйте внимание и уважение в своей речи и действиях." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:87 +msgid "Attempt collaboration and dialog before engaging in conflict." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:89 +msgid "" +"Refrain from demeaning, discriminatory, or harassing behavior and speech." +msgstr "" +"Воздержитесь от унижений, дискриминации, или оскорбляющего поведения и речи." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:92 +msgid "" +"Be mindful of your surroundings and of your fellow participants. Alert " +"community leaders if you notice:" +msgstr "" +"Будьте внимательны к своему окружению и другим участникам. Предупредите " +"руководителей сообщества, если заметите:" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:94 +msgid "a dangerous situation" +msgstr "опасную ситуацию" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:96 +msgid "someone in distress" +msgstr "кого-то в беде" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:98 +msgid "violations of this code of conduct, even if they seem minor" +msgstr "" +"нарушения этого Кодекса поведения, даже если они кажутся незначительными" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:101 +msgid "" +"Remember that community event venues may be shared with members of the " +"public. Please be respectful to everyone using these locations." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:103 +msgid "Respect the privacy of your fellow community members." +msgstr "Уважайте приватность ваших коллег-членов сообщества." + +#. type: Plain text +#: ../code_of_conduct.txt:106 +#, no-wrap +msgid "" +"3. Unacceptable behaviors\n" +"============================================================\n" +msgstr "" +"3. Неприемлемое поведение\n" +"============================================================\n" + +#. type: Plain text +#: ../code_of_conduct.txt:109 +msgid "The following behaviors are unacceptable within our community:" +msgstr "Подобное поведение не приемлемо в нашем сообществе:" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:114 +msgid "" +"Violence, sexual assault, threats of violence, or violent language directed " +"against another person, especially violence against a person or group based " +"on a protected characteristic. (Display of weapons may constitute " +"intimidation or a threat of violence.)" +msgstr "" +"Насилие, в т.ч. сексуальное, угрозы насилия или насильственные выражения, " +"направленные против другого лица, особенно насилие в отношении лица или " +"группы на основе защищаемого признака. (Демонстрация оружия может " +"представлять собой запугивание или угрозу насилия.)" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:117 +msgid "" +"Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory" +" jokes and language." +msgstr "" +"Сексистские, расистские, гомофобные, трансфобные, эйблистские или иные " +"дискриминационные шутки и выражения." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:122 +msgid "" +"Spontaneously posting or displaying sexually explicit or violent material. " +"(If it is necessary to share such material when working on Tor's mission, do" +" so with sensitivity. Be aware that many people don't want to see it.)" +msgstr "" +"Спонтанное размещение или демонстрирование материалов откровенного " +"сексуального или насильственного характера. (Если необходимо поделиться " +"таким материалом при работе над миссией Tor, делайте это с осторожностью. " +"Учитывайте, что многие люди не хотят этого видеть.)" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:125 +msgid "" +"Posting or threatening to post other people’s personally identifying " +"information (\"doxing\") without their consent." +msgstr "" +"Размещение или угроза размещения личной информации других людей " +"(\"доксинг\") без их согласия." + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:127 +msgid "Personal insults or attacks, particularly those related to:" +msgstr "Личные оскорбления или нападения, особенно связанные с:" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:129 +msgid "experience" +msgstr "опытом" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:131 +msgid "gender identity or expression" +msgstr "гендерной идентичностью или самовыражением" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:133 +msgid "sexual orientation" +msgstr "сексуальной ориентацией" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:135 +msgid "family" +msgstr "семьей" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:137 +msgid "relationships" +msgstr "отношениями" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:139 +msgid "ability (whether bodily or mental)" +msgstr "способностями (будь то физических или психических)" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:141 +msgid "personal appearance" +msgstr "внешним видом" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:143 +msgid "socioeconomic status" +msgstr "социально-экономическим статусом" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:145 +msgid "body size" +msgstr "размером тела" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:147 +msgid "race" +msgstr "расой" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:149 +msgid "ethnicity" +msgstr "этнической принадлежностью" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:151 +msgid "age" +msgstr "возрастом" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:153 +msgid "religion" +msgstr "религией" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:155 +msgid "nationality" +msgstr "национальностью" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:157 +msgid "membership in a disadvantaged and/or underrepresented group" +msgstr "принадлежностью к неблагополучной и/или недопредставленной группе" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:161 +msgid "" +"Inappropriate photography, audio recording, or recording of personal " +"information. You should have someone's consent before recording these " +"things, and before posting them publicly." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:164 +msgid "" +"Inappropriate physical contact. You should have someone’s consent before " +"touching them." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:167 +msgid "" +"Unwelcome sexual attention: this includes sexualized comments or jokes, " +"inappropriate touching, groping, and unwelcome sexual advances." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:169 +msgid "Deliberate intimidation, stalking or following (online or in person)." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:172 +msgid "" +"Deliberately undermining the spirit of this code while following the letter." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:175 +msgid "" +"Sustained disruption of any community events, including talks, " +"presentations, and online conversations." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:177 +msgid "Deliberately pushing against someone's stated boundaries." +msgstr "" + +#. type: Bullet: ' * ' +#: ../code_of_conduct.txt:179 +msgid "Advocating for, or encouraging, any of the above behavior." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:182 +#, no-wrap +msgid "" +"4. Unacceptable behavior has consequences\n" +"============================================================\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:188 +msgid "" +"We will not tolerate unacceptable behavior from any community member. We " +"will not make exceptions for sponsors and those with decision-making " +"authority. People in formal or informal leadership roles must model the " +"highest standards of behavior." +msgstr "" +"Мы не потерпим неприемлемого поведения со стороны любого члена сообщества. " +"Мы не будем делать исключений для спонсоров и тех, кто наделен директивными " +"полномочиями. Люди, выполняющие формальные или неформальные руководящие " +"роли, должны моделировать самые высокие стандарты поведения." + +#. type: Plain text +#: ../code_of_conduct.txt:192 +msgid "" +"Anyone asked by another community member to stop unacceptable behavior is " +"expected to comply immediately. Please don't step in on someone else's " +"behalf without their consent." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:195 +#, no-wrap +msgid "" +"5. Where to go for help\n" +"============================================================\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:201 +msgid "" +"The Community Council is an elected body of Tor Core Contributors who can " +"assist with intra-community conflict resolution. Community Council policies " +"and information can be found on the Community Council wiki [1]. You can " +"contact the whole Community council:" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:203 +msgid "if you have questions or concerns about the code of conduct, or" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:205 +msgid "if you feel that you have witnessed a code of conduct violation" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:212 +msgid "" +"However, if you feel that there is a conflict of interest with any council " +"member, you may contact members individually. Council members' GPG keys are " +"listed on the Community Council wiki. If there is a conflict of interest, " +"the affected council member will recuse themselves. They will not be " +"involved in any discussion or documentation of the incident. More about the " +"Community Council can be found in the guidelines [2]." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:215 +#, no-wrap +msgid "" +"6. What to do if you witness unacceptable behavior\n" +"============================================================\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:230 +msgid "" +"If you are subject to or witness unacceptable behavior, or have any other " +"concerns, please notify the Community Council as soon as possible. You can " +"contact the community council in person, or at tor-community-" +"council(a)lists.torproject.org. Current councilmembers are listed on the wiki " +"[1]. The Community Council's incident response will vary on a case-by-case " +"basis. The council will make every effort to respond to the incident " +"immediately. The council will prioritize the safety of the person who has " +"been harmed, or is at risk of harm. Person(s) who have been harmed or are at" +" risk of harm can withdraw the incident report at any time. We will never do" +" anything without the consent of the person who has been harmed or is at " +"risk of harm, except in situations where there is a threat of imminent " +"danger or harm to anyone. More information about the Community Council's " +"incident reporting and response policies can be found on their wiki [1]." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:233 +#, no-wrap +msgid "" +"7. What the person reporting a violation can expect\n" +"============================================================\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:242 +msgid "" +"The Community Council prioritizes the safety and well-being of any person " +"who feels that they have been harmed or may be in danger of being harmed. " +"Anyone reporting an issue to the Community Council can expect that their " +"report will be taken seriously. Initial reports can be taken in written or " +"verbal form. If the incident does not require an immediate resolution, then " +"a written report can be shared with the Community Council in an encrypted " +"format. The next steps in an incident response will vary on a case-by-case " +"basis." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:245 +#, no-wrap +msgid "" +"8. How the Community Council responds to incidents\n" +"============================================================\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:252 +msgid "" +"If a community member engages in unacceptable behavior, the Community " +"Council may take any action they deem appropriate, including but not limited" +" to a warning, informal mediation, temporary ban or permanent expulsion from" +" the community. Any actions and decisions by the Community Council may be " +"appealed by following the appeals process in the Community Council " +"Guidelines [1]." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:255 +#, no-wrap +msgid "" +"9. Scope of this document\n" +"============================================================\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:258 +msgid "This code of conduct covers all community participants:" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:260 +msgid "paid and unpaid contributors" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:262 +msgid "sponsors" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:264 +msgid "other guests" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:266 +msgid "when interacting:" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:268 +msgid "in all online and in-person community venues" +msgstr "" + +#. type: Bullet: ' - ' +#: ../code_of_conduct.txt:270 +msgid "in one-on-one communications that relate to community work" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:277 +msgid "" +"This code of conduct and its related procedures also applies to unacceptable" +" behavior occurring outside the scope of community activities when such " +"behavior has the potential to adversely affect the safety and well-being of " +"community members. As members of the Tor community, we support and follow " +"this Code while we are working on Tor, and take care not to undermine it in " +"the rest of our time." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:280 +#, no-wrap +msgid "" +"10. License and attribution\n" +"============================================================\n" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:284 +msgid "" +"This code of conduct is shared under a Creative Commons CC-BY-SA 4.0 " +"International license." +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:287 +msgid "" +"This code of conduct uses some language and framing from the Citizen Code of" +" Conduct, which is shared under a CC-BY-SA license: citizencodeofconduct.org" +msgstr "" + +#. type: Plain text +#: ../code_of_conduct.txt:289 +msgid "" +"[1] https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil [2] " +"https://gitweb.torproject.org/community/policies.git/tree/community_council…" +msgstr ""

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 03 Oct '19

03 Oct '19

commit 5990fd6fe5d5e66d32d6d16c0f8723824a54e917 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 3 08:22:57 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+zh-CN.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 833c8dc3d..9810536c1 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -226,7 +226,7 @@ msgstr "如果您的Tor 浏览器拷贝拥有独特标记，您的浏览活动 msgid "" "Basically, each browser's settings and features create what is called a " "\"browser fingerprint\"." -msgstr "" +msgstr "简单来说，所有浏览器的设置与特性都会创造一个叫“浏览器指纹”的东西。" #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description) @@ -253,7 +253,7 @@ msgstr "" msgid "" "This means each Tor Browser user looks like every other Tor Browser user, " "making it difficult to track any individual user." -msgstr "" +msgstr "这意味着所有的Tor 浏览器用户看起来都一样，使得追踪一个单独的用户变得困难。" #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description)

1 0