January 2020 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'pr_1643_squashed'
by nickm＠torproject.org 13 Jan '20

13 Jan '20

commit 8b46372f264450cb2a8876254c2ba4d0a64eb6dc Merge: 5888db496 d99e7cebb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 13 13:26:23 2020 -0500 Merge branch 'pr_1643_squashed' changes/ticket32846 | 3 + doc/tor.1.txt | 1276 ++++++++++++++++++++++++++------------------------- 2 files changed, 649 insertions(+), 630 deletions(-)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 13 Jan '20

13 Jan '20

commit 75d7c92734f2b2cd7d3c163e358e78257f6479b1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 13 18:23:44 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 49 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index 301efed6dc..b5417b156b 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -3048,7 +3048,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-47/ #: (content/tbb/tbb-47/contents+en.lrquestion.title) msgid "My internet connection requires an HTTP or SOCKS Proxy" -msgstr "" +msgstr "Мое интернет-подключение требует прокси HTTP или SOCKS" #: https//support.torproject.org/tbb/tbb-47/ #: (content/tbb/tbb-47/contents+en.lrquestion.description) @@ -4880,7 +4880,7 @@ msgstr "" #: https//support.torproject.org/operators/ipv6-relay/ #: (content/operators/ipv6-relay/contents+en.lrquestion.title) msgid "Can I use IPv6 on my relay?" -msgstr "" +msgstr "Могу ли я использовать IPv6 для своего узла?" #: https//support.torproject.org/operators/ipv6-relay/ #: (content/operators/ipv6-relay/contents+en.lrquestion.description) @@ -4892,6 +4892,13 @@ msgid "" " in their [torrc](https://support.torproject.org/tbb/tbb-editing-torrc/) " "configuration files when IPv6 connectivity is available." msgstr "" +"Tor [поддерживает IPv6 " +"частично](https://trac.torproject.org/projects/tor/wiki/org/roadmaps/Tor/IP…." +" Мы предлагаем всем операторам узлов [включить поддержку " +"IPv6](https://trac.torproject.org/projects/tor/wiki/TorRelayGuide#IPv6) в " +"своих конфигурационных файлах [torrc](https://support.torproject.org/tbb" +"/tbb-editing-torrc/), чтобы быть наготове, когда поддержка IPv6 будет " +"доступна." #: https//support.torproject.org/operators/ipv6-relay/ #: (content/operators/ipv6-relay/contents+en.lrquestion.description) @@ -4899,11 +4906,14 @@ msgid "" "For the time being Tor will require IPv4 addresses on relays, you can not " "run a Tor relay on a host with IPv6 addresses only." msgstr "" +"В настоящее время Tor требует для своих узлов адресов IPv4. Вы не можете " +"организовать узел Tor только с IPv6." #: https//support.torproject.org/operators/limit-total-bandwidth/ #: (content/operators/limit-total-bandwidth/contents+en.lrquestion.title) msgid "How can I limit the total amount of bandwidth used by my Tor relay?" msgstr "" +"Как ограничить пропускную способность канала, используемого узлом Tor?" #: https//support.torproject.org/operators/limit-total-bandwidth/ #: (content/operators/limit-total-bandwidth/contents+en.lrquestion.description) @@ -9291,7 +9301,7 @@ msgstr "8. Вернитесь на страницу IRC, где вы залог #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "`/msg nickserv checkverify`" -msgstr "" +msgstr "`/msg nickserv checkverify`" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -9306,12 +9316,12 @@ msgstr "10. Если все в порядке, вы увидите такое с #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "*!NickServ*checkverify" -msgstr "" +msgstr "*!NickServ*checkverify" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "Usermodechange: +R" -msgstr "" +msgstr "Usermodechange: +R" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -9379,7 +9389,7 @@ msgstr "" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) msgid "#### 1. Install `apt-transport-https`" -msgstr "" +msgstr "#### 1. Установите `apt-transport-https`" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9392,7 +9402,7 @@ msgstr "" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) msgid "# apt install apt-transport-https" -msgstr "" +msgstr "# apt install apt-transport-https" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9501,7 +9511,7 @@ msgstr "" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) msgid "#### 4. Install tor and tor debian keyring" -msgstr "" +msgstr "#### 4. Установите Tor и связку ключей Tor Debian" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9509,18 +9519,21 @@ msgid "" "We provide a Debian package to help you keep our signing key current. It is " "recommended you use it. Install it with the following commands:" msgstr "" +"Мы предлагаем пакет Debian, чтобы помочь вам сохранять самую свежую версию " +"вашего ключа для подписи. Рекомендуем использовать его. Для установки " +"используйте следующие команды:" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description) msgid "# apt update" -msgstr "" +msgstr "# apt update" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) msgid "# apt install tor deb.torproject.org-keyring" -msgstr "" +msgstr "# apt install tor deb.torproject.org-keyring" #: https//support.torproject.org/apt/tor-ubuntu/ #: (content/apt/apt-2/contents+en.lrquestion.title) @@ -9566,27 +9579,27 @@ msgstr "" #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description) msgid "# apt install apt-transport-tor" -msgstr "" +msgstr "# apt install apt-transport-tor" #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description) msgid "Then replace the address in the lines added before with, for example:" -msgstr "" +msgstr "Теперь замените адрес в строчках, добавленных ранее, например:" #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description) msgid "# For the stable version." -msgstr "" +msgstr "# Для стабильной версии." #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description) msgid "deb tor://sdscoq7snqtznauu.onion/torproject.org <DISTRIBUTION> main" -msgstr "" +msgstr "deb tor://sdscoq7snqtznauu.onion/torproject.org <DISTRIBUTION> main" #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description) msgid "# For the unstable version." -msgstr "" +msgstr "# Для нестабильной версии." #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description) @@ -9594,17 +9607,19 @@ msgid "" "deb tor://sdscoq7snqtznauu.onion/torproject.org tor-nightly-" "master-<DISTRIBUTION> main" msgstr "" +"deb tor://sdscoq7snqtznauu.onion/torproject.org tor-nightly-" +"master-<DISTRIBUTION> main" #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description) msgid "" "Now refresh your sources and try if it's still possible to install tor:" -msgstr "" +msgstr "Теперь обновите свои источники и попробуйте, можно ли установить Tor:" #: https//support.torproject.org/apt/apt-over-tor/ #: (content/apt/apt-3/contents+en.lrquestion.description) msgid "# apt install tor" -msgstr "" +msgstr "# apt install tor" #: lego/templates/banner.html:2 lego/templates/banner.html:4 #: templates/banner.html:2 templates/banner.html:4

1 0

[dip/master] Remove some gitaly specific configuration
by hiro＠torproject.org 13 Jan '20

13 Jan '20

commit 09fbc71186b90ed9e366daff1787d50db579127e Author: hiro <hiro(a)torproject.org> Date: Mon Jan 13 19:02:29 2020 +0100 Remove some gitaly specific configuration --- roles/gitaly/templates/gitaly.toml.j2 | 1 - roles/gitlab/templates/unicorn.rb.j2 | 3 --- 2 files changed, 4 deletions(-) diff --git a/roles/gitaly/templates/gitaly.toml.j2 b/roles/gitaly/templates/gitaly.toml.j2 index fe52ded..1d4b130 100644 --- a/roles/gitaly/templates/gitaly.toml.j2 +++ b/roles/gitaly/templates/gitaly.toml.j2 @@ -1,7 +1,6 @@ # Example Gitaly configuration file socket_path = "{{ ansible_env.XDG_RUNTIME_DIR | mandatory }}/gitaly/gitaly.socket" -internal_socket_dir = "{{ ansible_env.XDG_RUNTIME_DIR | mandatory }}/gitaly/gitaly.socket" # The directory where Gitaly's executables are stored bin_dir = "{{ ansible_user_dir }}/bin" diff --git a/roles/gitlab/templates/unicorn.rb.j2 b/roles/gitlab/templates/unicorn.rb.j2 index 406b359..338808a 100644 --- a/roles/gitlab/templates/unicorn.rb.j2 +++ b/roles/gitlab/templates/unicorn.rb.j2 @@ -81,9 +81,6 @@ ENV['GITLAB_UNICORN_MEMORY_MIN'] = (600 * 1 << 20).to_s # Max memory size (RSS) per worker ENV['GITLAB_UNICORN_MEMORY_MAX'] = (800 * 1 << 20).to_s -# Do not limit gitaly -ENV['GITALY_DISABLE_REQUEST_LIMITS'] = '1' - require_relative "{{ ansible_user_dir }}/gitlab/lib/gitlab/cluster/lifecycle_events" before_exec do |server|

1 0

[dip/master] Remove specific config from gitaly.toml
by hiro＠torproject.org 13 Jan '20

13 Jan '20

commit b55990796fca887fac14d036d934250ab4d07285 Author: hiro <hiro(a)torproject.org> Date: Mon Jan 13 19:05:19 2020 +0100 Remove specific config from gitaly.toml --- roles/gitaly/templates/gitaly.toml.j2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/gitaly/templates/gitaly.toml.j2 b/roles/gitaly/templates/gitaly.toml.j2 index 1d4b130..99f4353 100644 --- a/roles/gitaly/templates/gitaly.toml.j2 +++ b/roles/gitaly/templates/gitaly.toml.j2 @@ -42,7 +42,6 @@ grpc_latency_buckets = [0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 30 [gitaly-ruby] # The directory where gitaly-ruby is installed dir = "{{ ansible_user_dir }}/gitaly/ruby" -num_workers = 4 # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) # max_rss = 300000000 @@ -60,4 +59,4 @@ dir = "{{ ansible_user_dir }}/gitlab-shell" # # You can adjust the concurrency of each RPC endpoint [[concurrency]] rpc = "/gitaly.RepositoryService/GarbageCollect" -max_per_repo = 2 +max_per_repo = 1

1 0

[dip/master] Clean up inventory
by hiro＠torproject.org 13 Jan '20

13 Jan '20

commit 3c354ed40855c57860ae032e1556a52e813690e9 Author: hiro <hiro(a)torproject.org> Date: Mon Jan 13 19:03:36 2020 +0100 Clean up inventory --- inventories/prod/host_vars/salsa-logs.debian.net.yml | 3 --- .../prod/host_vars/salsa-runner.salsa-runner.debian.net.yml | 9 --------- inventories/prod/hosts | 6 ------ 3 files changed, 18 deletions(-) diff --git a/inventories/prod/host_vars/salsa-logs.debian.net.yml b/inventories/prod/host_vars/salsa-logs.debian.net.yml deleted file mode 100644 index 734fec8..0000000 --- a/inventories/prod/host_vars/salsa-logs.debian.net.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dehydrated_domains: -- "{{ external_domain_logs }}" diff --git a/inventories/prod/host_vars/salsa-runner.salsa-runner.debian.net.yml b/inventories/prod/host_vars/salsa-runner.salsa-runner.debian.net.yml deleted file mode 100644 index b1d5813..0000000 --- a/inventories/prod/host_vars/salsa-runner.salsa-runner.debian.net.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -gitlab_runner_concurrent: 32 -gitlab_runner_instances: - - name: salsa-runner.debian.net - cache_bucket: debian-salsa-prod-runner-cache - docker_privileged: true - machine_google_project: debian-salsa-prod-build - machine_google_zone: us-west1-c - machine_google_machine_type: n1-standard-1 diff --git a/inventories/prod/hosts b/inventories/prod/hosts index 85da552..348adae 100644 --- a/inventories/prod/hosts +++ b/inventories/prod/hosts @@ -1,8 +1,2 @@ [gitlab] gitlab-01.torproject.org ansible_connection=local - -[salsa-webhook] -webhook.dip.torproject.org ansible_connection=local ansible_become=True ansible_host=gitlab-01.torproject.org ansible_become_user=salsa-webhook - -[docker-registry] -registry.dip.torproject.org ansible_connection=local ansible_become=True ansible_host=gitlab-01.torproject.org ansible_become_user=salsa-registry

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 13 Jan '20

13 Jan '20

commit 67aa121f30ec565a15f77490d945f614060e94bd Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 13 17:53:56 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 1 + 1 file changed, 1 insertion(+) diff --git a/contents+ru.po b/contents+ru.po index 51f8be65aa..301efed6dc 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -9496,6 +9496,7 @@ msgstr "" msgid "" "# gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -" msgstr "" +"# gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 13 Jan '20

13 Jan '20

commit 3cbb0dce9e2fd088ba8a84849995b4fdf44251c5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 13 17:23:48 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index 3d38f4824c..51f8be65aa 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -5844,6 +5844,9 @@ msgid "" "relays](https://trac.torproject.org/projects/tor/wiki/TorRelayGuide/Securit…" " for more suggestions." msgstr "" +"В любом случае нужно выполнять обновления безопасности. Другие идеи о " +"безопасности узлов Tor изложены в [этой " +"статье](https://trac.torproject.org/projects/tor/wiki/TorRelayGuide/Securit…." #: https//support.torproject.org/operators/why-isnt-my-relay-being-used-more/ #: (content/operators/why-isnt-my-relay-being-used-more/contents+en.lrquestion.title) @@ -9350,7 +9353,7 @@ msgstr "Если что-то пойдет не так, можете попрос msgid "" "You can toggle back and forth between channels by clicking on the different " "channel names at the top left of the IRC window." -msgstr "" +msgstr "Переключаться между каналами можно верхнем левом углу окна IRC." #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.title) @@ -9397,21 +9400,23 @@ msgid "" "#### 2. Add the following entries to `/etc/apt/sources.list` or a new file " "in `/etc/apt/sources.list.d/`" msgstr "" +"#### 2. Добавьте следующие данные в `/etc/apt/sources.list` или в новый файл" +" в `/etc/apt/sources.list.d/`" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) msgid "deb https://deb.torproject.org/torproject.org <DISTRIBUTION> main" -msgstr "" +msgstr "deb https://deb.torproject.org/torproject.org <DISTRIBUTION> main" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) msgid "deb-src https://deb.torproject.org/torproject.org <DISTRIBUTION> main" -msgstr "" +msgstr "deb-src https://deb.torproject.org/torproject.org <DISTRIBUTION> main" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) msgid "If you want to try experimental packages:" -msgstr "" +msgstr "Если хотите попробовать экспериментальные пакеты:" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9419,6 +9424,8 @@ msgid "" "deb https://deb.torproject.org/torproject.org tor-" "experimental-0.3.4.x-<DISTRIBUTION> main" msgstr "" +"deb https://deb.torproject.org/torproject.org tor-" +"experimental-0.3.4.x-<DISTRIBUTION> main" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9426,11 +9433,13 @@ msgid "" "deb-src https://deb.torproject.org/torproject.org tor-" "experimental-0.3.4.x-<DISTRIBUTION> main" msgstr "" +"deb-src https://deb.torproject.org/torproject.org tor-" +"experimental-0.3.4.x-<DISTRIBUTION> main" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) msgid "Or nightly builds:" -msgstr "" +msgstr "Или \"ночные сборки\":" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9438,6 +9447,8 @@ msgid "" "deb https://deb.torproject.org/torproject.org tor-nightly-" "master-<DISTRIBUTION> main" msgstr "" +"deb https://deb.torproject.org/torproject.org tor-nightly-" +"master-<DISTRIBUTION> main" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9445,6 +9456,8 @@ msgid "" "deb-src https://deb.torproject.org/torproject.org tor-nightly-" "master-<DISTRIBUTION> main" msgstr "" +"deb-src https://deb.torproject.org/torproject.org tor-nightly-" +"master-<DISTRIBUTION> main" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9454,6 +9467,9 @@ msgid "" "Replace `<DISTRIBUTION>` with your Operating System codename. Run " "`lsb_release -c` or `cat /etc/debian_version` to discover." msgstr "" +"Замените `<DISTRIBUTION>` на кодовое имя своей операционной системы. " +"Запустите `lsb_release -c` или `cat /etc/debian_version`, чтобы узнать " +"кодовое имя." #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9461,6 +9477,8 @@ msgid "" "#### 3. Then add the gpg key used to sign the packages by running the " "following commands at your command prompt" msgstr "" +"#### 3. Теперь добавьте gpg-ключ, который был использован для подписывания " +"пакетов: выполните следующие команды в командной строке" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -9469,6 +9487,9 @@ msgid "" "https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…" " | gpg --import" msgstr "" +"# curl " +"https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E8…" +" | gpg --import" #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 13 Jan '20

13 Jan '20

commit a838a0f4953b68692bb60ad0bfce621a44f2c325 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 13 16:53:47 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index 1e16192ba4..3d38f4824c 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -5677,6 +5677,10 @@ msgid "" "support](https://community.torproject.org/relay/setup/brige). In that case " "you should have at least 1 MBit/s of available bandwidth." msgstr "" +"Даже если у вас нет подключения 10 Mбит/с, вы можете быть полезным сети Tor." +" Организуйте у себя [мост Tor с поддержкой " +"obfs4](https://community.torproject.org/relay/setup/brige). Тогда вам хватит" +" и 1 Мбит/с." #: https//support.torproject.org/operators/upgrade-or-move/ #: (content/operators/upgrade-or-move/contents+en.lrquestion.title) @@ -5713,6 +5717,9 @@ msgid "" "torrc and the same DataDirectory, then the upgrade should just work and your" " relay will keep using the same key." msgstr "" +"Таким образом, если вы будете обновлять свой узел Tor и сохраните прежние " +"torrc и DataDirectory, то обновление пройдет без осложнений, и ваш узел " +"будет использовать тот же ключ." #: https//support.torproject.org/operators/upgrade-or-move/ #: (content/operators/upgrade-or-move/contents+en.lrquestion.description) @@ -5720,6 +5727,8 @@ msgid "" "If you need to pick a new DataDirectory, be sure to copy your old " "keys/ed25519_master_id_secret_key and keys/secret_id_key over." msgstr "" +"Если необходимо сменить DataDirectory, позаботьтесь о том, чтобы скопировать" +" свои прежние keys/ed25519_master_id_secret_key и keys/secret_id_key." #: https//support.torproject.org/operators/upgrade-or-move/ #: (content/operators/upgrade-or-move/contents+en.lrquestion.description) @@ -5861,6 +5870,8 @@ msgid "" "The lifecycle of a new relay is explained in more depth in [this blog " "post](https://blog.torproject.org/blog/lifecycle-of-a-new-relay)." msgstr "" +"О том, как работает новый узел, подробно рассказано в [этом " +"блоге](https://blog.torproject.org/blog/lifecycle-of-a-new-relay)." #: https//support.torproject.org/operators/why-isnt-my-relay-being-used-more/ #: (content/operators/why-isnt-my-relay-being-used-more/contents+en.lrquestion.description) @@ -5885,6 +5896,9 @@ msgid "" " resolving that hostname. Often people have old entries in their /etc/hosts " "file that point to old IP addresses." msgstr "" +"Tor узнает свой IP-адрес, запрашивая у компьютера имя хоста и определяя IP " +"по нему. Нередко бывает, что у людей хранятся старые записи в файле " +"/etc/hosts, и они указывают на старые IP-адреса." #: https//support.torproject.org/operators/wrong-ip/ #: (content/operators/wrong-ip/contents+en.lrquestion.description) @@ -9210,7 +9224,7 @@ msgstr "" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "### How to verify your nickname" -msgstr "### Как проверить свой никнейм" +msgstr "### Как подтвердить свой никнейм" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -9219,7 +9233,7 @@ msgid "" "project channel, your nickname must be **verified**." msgstr "" "Чтобы завершить регистрацию и получить доступ к каналу #tor-project, никнейм" -" должен быть **проверен**." +" должен быть **подтвержден**." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -9227,7 +9241,7 @@ msgid "" "1. To verify your nick, open a new browser window and go to " "https://services.oftc.net/login." msgstr "" -"1. Чтобы проверить свой ник, откройте в новом окне браузера сайт " +"1. Чтобы подтвердить свой ник, откройте в новом окне браузера сайт " "https://services.oftc.net/login." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ @@ -9258,7 +9272,7 @@ msgstr "" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "6. Fill out the CAPTCHA that pops up, and click ok." -msgstr "" +msgstr "6. Решите капчу во всплывающем окне и нажмите \"Ок\"." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) @@ -9304,32 +9318,32 @@ msgstr "" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "````" -msgstr "" +msgstr "````" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "Your nick is verified!" -msgstr "" +msgstr "Ваш никнейм подтвержден!" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "Now, to join #tor-project, you can just type:" -msgstr "" +msgstr "Чтобы подключиться к #tor-project, нужно набрать:" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "`/join #tor-project` and hit enter." -msgstr "" +msgstr "`/join #tor-project` и нажать \"Enter\"." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "You will be allowed into the channel. If so, Congratulations!" -msgstr "" +msgstr "Вы получите доступ в канал. Поздравляем!" #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description) msgid "However, if you get stuck, you can ask for help in the #tor channel." -msgstr "" +msgstr "Если что-то пойдет не так, можете попросить помощи в канале #tor." #: https//support.torproject.org/get-in-touch/why-i-cant-join-tor-channels/ #: (content/get-in-touch/why-i-cant-join-tor-channels/contents+en.lrquestion.description)

1 0

[dip/master] Build gitlab-shell with make
by hiro＠torproject.org 13 Jan '20

13 Jan '20

commit 26b174c80cc0bf928ad3c09fa1d22eb9688ea60f Author: Bastian Blank <waldi(a)debian.org> Date: Thu Dec 26 20:52:48 2019 +0100 Build gitlab-shell with make --- roles/gitlab-shell/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/gitlab-shell/tasks/main.yml b/roles/gitlab-shell/tasks/main.yml index f491ee7..fe05bd8 100644 --- a/roles/gitlab-shell/tasks/main.yml +++ b/roles/gitlab-shell/tasks/main.yml @@ -8,7 +8,7 @@ diff: false - name: build - command: bin/compile + command: make build args: chdir: "{{ ansible_user_dir }}/gitlab-shell"

1 0

[dip/master] Require ruby-dev instead of ruby2.3-dev
by hiro＠torproject.org 13 Jan '20

13 Jan '20

commit 81047e932efc9f41d0eb7233e7fb29c4b23aa72d Author: Bastian Blank <waldi(a)debian.org> Date: Mon Dec 23 09:56:45 2019 +0100 Require ruby-dev instead of ruby2.3-dev --- roles/gitlab_prereq/tasks/main.yml | 2 +- roles/system/gitlab/tasks/gitlab_base.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/gitlab_prereq/tasks/main.yml b/roles/gitlab_prereq/tasks/main.yml index c60cfb9..5a5f208 100644 --- a/roles/gitlab_prereq/tasks/main.yml +++ b/roles/gitlab_prereq/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: check packages - command: dpkg -l build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libre2-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate python-docutils pkg-config cmake git ruby2.3-dev bundler postgresql-client libpq-dev + command: dpkg -l build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libre2-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate python-docutils pkg-config cmake git ruby-dev bundler postgresql-client libpq-dev changed_when: false - name: check redis access diff --git a/roles/system/gitlab/tasks/gitlab_base.yml b/roles/system/gitlab/tasks/gitlab_base.yml index 9c24a23..943e065 100644 --- a/roles/system/gitlab/tasks/gitlab_base.yml +++ b/roles/system/gitlab/tasks/gitlab_base.yml @@ -20,7 +20,7 @@ - logrotate - pkg-config - python-docutils - - ruby2.3-dev + - ruby-dev - zlib1g-dev install_recommends: false

1 0