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

[dip/master] Update prod vars
by hiro＠torproject.org 09 Dec '19

09 Dec '19

commit 774adb7b0dc8096227cbe0f6d3bf84234ef60511 Author: hiro <hiro(a)torproject.org> Date: Mon Dec 9 17:04:56 2019 +0100 Update prod vars --- inventories/prod/group_vars/all.yml | 1 - inventories/test/group_vars/all.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/inventories/prod/group_vars/all.yml b/inventories/prod/group_vars/all.yml index f25d011..10849cf 100644 --- a/inventories/prod/group_vars/all.yml +++ b/inventories/prod/group_vars/all.yml @@ -4,7 +4,6 @@ external_domain_pages: pages.dip.torproject.org external_domain_registry: registry.dip.torproject.org external_domain_logs: logs.dip.torproject.org ldapsync_filter: (supplementaryGid=TorProject) -gitlab_storage_artifacts: torproject-dip-prod-gitlab-artifacts gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs ldap_org: torproject ldap_host: db.torproject.org diff --git a/inventories/test/group_vars/all.yml b/inventories/test/group_vars/all.yml index f25d011..10849cf 100644 --- a/inventories/test/group_vars/all.yml +++ b/inventories/test/group_vars/all.yml @@ -4,7 +4,6 @@ external_domain_pages: pages.dip.torproject.org external_domain_registry: registry.dip.torproject.org external_domain_logs: logs.dip.torproject.org ldapsync_filter: (supplementaryGid=TorProject) -gitlab_storage_artifacts: torproject-dip-prod-gitlab-artifacts gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs ldap_org: torproject ldap_host: db.torproject.org

1 0

[dip/master] Change submodule path
by hiro＠torproject.org 09 Dec '19

09 Dec '19

commit 2dac1e2c62dec702e2fcd4ecfab68d48b947dd26 Author: hiro <hiro(a)torproject.org> Date: Mon Dec 9 17:01:54 2019 +0100 Change submodule path --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 85a091f..9553193 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "inventories/current/secrets/group_vars"] - path = inventories/current/secrets/group_vars + path = inventories/current/ url = https://git.torproject.org/admin/services/gitlab/dip-configs.git

1 0

[dip-configs/master] Structure folders
by hiro＠torproject.org 09 Dec '19

09 Dec '19

commit a8cda471a8b41f4852163b91abff5ec5d357e9bf Author: hiro <hiro(a)torproject.org> Date: Mon Dec 9 17:01:13 2019 +0100 Structure folders --- group_vars/all.yml | 9 +++++++++ all.yml.sample => secrets/group_vars/all.yml.sample | 0 2 files changed, 9 insertions(+) diff --git a/group_vars/all.yml b/group_vars/all.yml new file mode 100644 index 0000000..7d2d45e --- /dev/null +++ b/group_vars/all.yml @@ -0,0 +1,9 @@ +external_domain: dip.torproject.org +external_domain_pages: pages.dip.torproject.org +external_domain_registry: registry.dip.torproject.org +external_domain_logs: logs.dip.torproject.org +ldapsync_filter: (supplementaryGid=TorProject) +gitlab_storage_artifacts: torproject-dip-prod-gitlab-artifacts +gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs +ldap_org: torproject +ldap_host: db.torproject.org diff --git a/all.yml.sample b/secrets/group_vars/all.yml.sample similarity index 100% rename from all.yml.sample rename to secrets/group_vars/all.yml.sample

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 09 Dec '19

09 Dec '19

commit 997a4766b52b930d661c9347c2989400adbf9851 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 9 15:45:41 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/mk/LC_MESSAGES/messages.po | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/locale/mk/LC_MESSAGES/messages.po b/locale/mk/LC_MESSAGES/messages.po index fcd8953c10..78edbf069b 100644 --- a/locale/mk/LC_MESSAGES/messages.po +++ b/locale/mk/LC_MESSAGES/messages.po @@ -5,10 +5,11 @@ # Liljana Ackovska <liljanagjurova(a)gmail.com>, 2019 # Matej Plavevski <matej.plavevski+github(a)gmail.com>, 2019 # Zarko Gjurov <zarkogjurov(a)gmail.com>, 2019 +# Dan Nikoloski <nikoloskid(a)protonmail.com>, 2019 # msgid "" msgstr "" -"Last-Translator: Zarko Gjurov <zarkogjurov(a)gmail.com>, 2019\n" +"Last-Translator: Dan Nikoloski <nikoloskid(a)protonmail.com>, 2019\n" "Language-Team: Macedonian (https://www.transifex.com/otf/teams/1519/mk/)\n" "Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" @@ -89,12 +90,12 @@ msgstr "XXL" #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:47 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:70 msgid "Privacy and freedom online should be the default." -msgstr "" +msgstr "Приватностa и слободата преку интернет треба да бидат стандардно." #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:49 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:72 msgid "Donate to the Tor Project." -msgstr "" +msgstr "Донирајте на Tor проектот." #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:58 msgid "summary_large_image" @@ -102,7 +103,7 @@ msgstr "" #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:62 msgid "@torproject" -msgstr "" +msgstr "@tоrproject" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:54 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:54 @@ -113,21 +114,23 @@ msgstr "Подржете го Tor проектот денес!" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:83 msgid "Want to donate by credit card or PayPal?" -msgstr "" +msgstr "Сакаш да донираш со кредитна картичка или PayPal?" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:92 msgid "Donate using BTCPayServer" -msgstr "" +msgstr "Донирај користејќи BTCPayServer" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:126 msgid "Donate using wallet addresses" -msgstr "" +msgstr "Донирај користејќи wallet адреси." #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:133 msgid "" "Please fill out this form and then send your coins to the appropriate " "wallet." msgstr "" +"Ве молиме пополнете ја формата и пратете ги вашите coins на соодветниот " +"wallet." #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:135 msgid ""

1 0

[dip/master] Fix inventory configuration
by hiro＠torproject.org 09 Dec '19

09 Dec '19

commit 4ca6f5ae7feec4e494a6d96de431fade8d9278ae Author: hiro <hiro(a)torproject.org> Date: Mon Dec 9 16:44:17 2019 +0100 Fix inventory configuration --- inventories/prod/hosts | 25 +------------------------ inventories/test/group_vars/all.yml | 17 +++++++++-------- inventories/test/hosts | 23 +---------------------- 3 files changed, 11 insertions(+), 54 deletions(-) diff --git a/inventories/prod/hosts b/inventories/prod/hosts index 9029e4d..348adae 100644 --- a/inventories/prod/hosts +++ b/inventories/prod/hosts @@ -1,25 +1,2 @@ -[system/logs] -salsa-logs.debian.net - -[system/runner] -salsa-runner.debian.net - [gitlab] -godard.debian.org ansible_connection=local - -[gitlab-pages] -salsa-pages.godard.debian.org ansible_connection=local ansible_become=True ansible_host=godard.debian.org ansible_become_user=salsa-pages - -[gitlab-runner] -salsa-runner.salsa-runner.debian.net ansible_host=salsa-runner.debian.net ansible_user=salsa-runner - -[salsa-webhook] -salsa-webhook.godard.debian.org ansible_connection=local ansible_become=True ansible_host=godard.debian.org ansible_become_user=salsa-webhook - -[docker-registry] -salsa-registry.godard.debian.org ansible_connection=local ansible_become=True ansible_host=godard.debian.org ansible_become_user=salsa-registry - -[runners] - -gitlabrunner2.debian.net ansible_user=root - +gitlab-01.torproject.org ansible_connection=local diff --git a/inventories/test/group_vars/all.yml b/inventories/test/group_vars/all.yml index d90ab9b..f25d011 100644 --- a/inventories/test/group_vars/all.yml +++ b/inventories/test/group_vars/all.yml @@ -1,9 +1,10 @@ --- -external_domain: salsa-test.debian.net -external_domain_logs: salsa-test-logs.debian.net -external_domain_pages: salsa-test-pages.debian.net -external_domain_registry: salsa-test-registry.debian.net -external_domain_webhook: salsa-test-webhook.debian.net -ldapsync_filter: (supplementaryGid=gitdoadm) -gitlab_storage_artifacts: debian-salsa-test-gitlab-artifacts -gitlab_storage_lfs: debian-salsa-test-gitlab-lfs +external_domain: dip.torproject.org +external_domain_pages: pages.dip.torproject.org +external_domain_registry: registry.dip.torproject.org +external_domain_logs: logs.dip.torproject.org +ldapsync_filter: (supplementaryGid=TorProject) +gitlab_storage_artifacts: torproject-dip-prod-gitlab-artifacts +gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs +ldap_org: torproject +ldap_host: db.torproject.org diff --git a/inventories/test/hosts b/inventories/test/hosts index fbc8f9a..348adae 100644 --- a/inventories/test/hosts +++ b/inventories/test/hosts @@ -1,23 +1,2 @@ -[system/gitlab] -salsa-test.debian.net - -[system/logs] -salsa-test-logs.debian.net - -[system/runner] -salsa-test-runner.debian.net - [gitlab] -git.salsa-test.debian.net ansible_connection=local - -[gitlab-pages] -salsa-pages.salsa-test.debian.net ansible_connection=local ansible_become=True ansible_host=git.salsa-test.debian.net ansible_become_user=salsa-pages - -[gitlab-runner] -salsa-runner.salsa-test-runner.debian.net ansible_host=salsa-test-runner.debian.net ansible_user=salsa-runner - -[salsa-webhook] -salsa-webhook.salsa-test.debian.net ansible_connection=local ansible_become=True ansible_host=git.salsa-test.debian.net ansible_become_user=salsa-webhook - -[docker-registry] -salsa-registry.salsa-test.debian.net ansible_connection=local ansible_become=True ansible_host=git.salsa-test.debian.net ansible_become_user=salsa-registry +gitlab-01.torproject.org ansible_connection=local

1 0

[dip/master] Upgrade to 12.5.2
by hiro＠torproject.org 09 Dec '19

09 Dec '19

commit 82f006fc8a583cfbb6ac503c08ea42e4cf67d174 Author: Bastian Blank <waldi(a)debian.org> Date: Sat Nov 30 19:41:47 2019 +0100 Upgrade to 12.5.2 --- playbooks/group_vars/all.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/group_vars/all.yml b/playbooks/group_vars/all.yml index af5a9d2..b8aed7a 100644 --- a/playbooks/group_vars/all.yml +++ b/playbooks/group_vars/all.yml @@ -1,10 +1,10 @@ --- gitlab_repo: https://salsa.debian.org/salsa/gitlab.git -gitlab_version: v12.5.0-salsa-1 +gitlab_version: v12.5.2-salsa-1 gitlab_pages_version: v1.12.0 gitlab_shell_version: v10.2.0 -gitlab_workhorse_version: v8.14.0 -gitaly_version: v1.72.0 +gitlab_workhorse_version: v8.14.1 +gitaly_version: v1.72.1 gitlab_runner_version: v12.5.0 docker_machine_version: v0.16.1 docker_registry_version: v2.7.1

1 0

[dip/master] Upgrade to 12.5.0
by hiro＠torproject.org 09 Dec '19

09 Dec '19

commit 3e1c344e42964b18c7003cc83f80eb2020295fc3 Author: Bastian Blank <waldi(a)debian.org> Date: Sun Nov 24 19:48:09 2019 +0100 Upgrade to 12.5.0 --- playbooks/group_vars/all.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/playbooks/group_vars/all.yml b/playbooks/group_vars/all.yml index e663c8a..af5a9d2 100644 --- a/playbooks/group_vars/all.yml +++ b/playbooks/group_vars/all.yml @@ -1,11 +1,11 @@ --- gitlab_repo: https://salsa.debian.org/salsa/gitlab.git -gitlab_version: v12.4.2-salsa-1 -gitlab_pages_version: v1.11.0 +gitlab_version: v12.5.0-salsa-1 +gitlab_pages_version: v1.12.0 gitlab_shell_version: v10.2.0 gitlab_workhorse_version: v8.14.0 -gitaly_version: v1.67.0 -gitlab_runner_version: v12.4.1 +gitaly_version: v1.72.0 +gitlab_runner_version: v12.5.0 docker_machine_version: v0.16.1 docker_registry_version: v2.7.1 minio_version: RELEASE.2018-07-23T18-34-49Z

1 0

[dip/master] Fix typo in ldap host variable
by hiro＠torproject.org 09 Dec '19

09 Dec '19

commit b4689eb43c73c44d88c174572d439950366a1a3f Author: hiro <hiro(a)torproject.org> Date: Mon Dec 9 15:21:31 2019 +0100 Fix typo in ldap host variable --- inventories/prod/group_vars/all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventories/prod/group_vars/all.yml b/inventories/prod/group_vars/all.yml index 8fa8e97..f25d011 100644 --- a/inventories/prod/group_vars/all.yml +++ b/inventories/prod/group_vars/all.yml @@ -7,4 +7,4 @@ ldapsync_filter: (supplementaryGid=TorProject) gitlab_storage_artifacts: torproject-dip-prod-gitlab-artifacts gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs ldap_org: torproject -ldap_host: db.torproject.orgs +ldap_host: db.torproject.org

1 0

[dip/master] Update gitlab
by hiro＠torproject.org 09 Dec '19

09 Dec '19

commit ff47731b5adf8d83f4285cecc14da21da282aadf Author: hiro <hiro(a)torproject.org> Date: Mon Dec 9 15:40:15 2019 +0100 Update gitlab --- playbooks/group_vars/all.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/playbooks/group_vars/all.yml b/playbooks/group_vars/all.yml index b8aed7a..e5fc2c6 100644 --- a/playbooks/group_vars/all.yml +++ b/playbooks/group_vars/all.yml @@ -1,11 +1,20 @@ --- gitlab_repo: https://salsa.debian.org/salsa/gitlab.git +<<<<<<< HEAD gitlab_version: v12.5.2-salsa-1 gitlab_pages_version: v1.12.0 gitlab_shell_version: v10.2.0 gitlab_workhorse_version: v8.14.1 gitaly_version: v1.72.1 gitlab_runner_version: v12.5.0 +======= +gitlab_version: v12.4.2-salsa-1 +gitlab_pages_version: v1.11.0 +gitlab_shell_version: v10.2.0 +gitlab_workhorse_version: v8.14.0 +gitaly_version: v1.67.0 +gitlab_runner_version: v12.4.1 +>>>>>>> Update from upstream docker_machine_version: v0.16.1 docker_registry_version: v2.7.1 minio_version: RELEASE.2018-07-23T18-34-49Z

1 0

[dip/master] Support new Rack::Attack
by hiro＠torproject.org 09 Dec '19

09 Dec '19

commit fa94c7b46953d60e88862d6323a5c89ce8c88b64 Author: Bastian Blank <waldi(a)debian.org> Date: Sun Nov 24 19:47:27 2019 +0100 Support new Rack::Attack --- roles/gitlab/templates/rack_attack.rb.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/gitlab/templates/rack_attack.rb.j2 b/roles/gitlab/templates/rack_attack.rb.j2 index d4dec95..b48bf5e 100644 --- a/roles/gitlab/templates/rack_attack.rb.j2 +++ b/roles/gitlab/templates/rack_attack.rb.j2 @@ -28,7 +28,7 @@ unless Rails.env.test? || !rack_attack_enabled end end -Rack::Attack.blacklist("block from ip blacklist") do |req| +Rack::Attack.blocklist("block from ip blacklist") do |req| ::Gitlab::Redis::SharedState.with do |redis| begin ip = IPAddr.new(req.ip) @@ -58,7 +58,7 @@ Rack::Attack.blacklist("block from ip blacklist") do |req| end end -Rack::Attack.blacklisted_response = lambda do |env| +Rack::Attack.blocklisted_response = lambda do |env| reason = env['RACK_ATTACK_BLACKLIST_REASON'] if reason != '' text = "Forbidden, #{reason}\n"

1 0