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

[gettor/master] Update recipes with hosts
by hiro＠torproject.org 31 Aug '19

31 Aug '19

commit 98addd6879e735b756501f6b846bbf0fb2df8232 Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 12:45:50 2019 +0200 Update recipes with hosts --- inventories/hosts | 2 ++ playbooks/update.yml | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/inventories/hosts b/inventories/hosts new file mode 100644 index 0000000..bff032f --- /dev/null +++ b/inventories/hosts @@ -0,0 +1,2 @@ +[gettor] +getulum.torproject.org ansible_connection=local diff --git a/playbooks/update.yml b/playbooks/update.yml index ebb2417..4dbce74 100644 --- a/playbooks/update.yml +++ b/playbooks/update.yml @@ -1,4 +1,7 @@ -tasks: - - import_role: - name: gettor - tags: gettor +--- +- hosts: + - gitlab + tasks: + - import_role: + name: gettor + tags: gettor

1 0

[gettor/master] Edit recipes and roles
by hiro＠torproject.org 31 Aug '19

31 Aug '19

commit 92c0ca0e0bb97edc82a155aa3753e7ff365f259d Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 12:35:46 2019 +0200 Edit recipes and roles --- playbooks/{ => group_vars}/all.yml | 0 playbooks/update.yml | 4 ++++ roles/gettor/tasks/main.yml | 2 ++ roles/gettor/tasks/restart.yml | 22 ++++++++++++++++++++++ roles/gettor/tasks/source.yml | 11 ----------- 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/playbooks/all.yml b/playbooks/group_vars/all.yml similarity index 100% rename from playbooks/all.yml rename to playbooks/group_vars/all.yml diff --git a/playbooks/update.yml b/playbooks/update.yml new file mode 100644 index 0000000..ebb2417 --- /dev/null +++ b/playbooks/update.yml @@ -0,0 +1,4 @@ +tasks: + - import_role: + name: gettor + tags: gettor diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index 6aaa7dc..3e9e9e0 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -1 +1,3 @@ +- import_tasks: source.yml - import_tasks: db.yml +- import_tasks: restart.yml diff --git a/roles/gettor/tasks/restart.yml b/roles/gettor/tasks/restart.yml new file mode 100644 index 0000000..33ba3c8 --- /dev/null +++ b/roles/gettor/tasks/restart.yml @@ -0,0 +1,22 @@ +--- + +- name: virtualenv start + command: > + virtualenv venv + environment: + PATH: {{ gettor_path }} + + +- name: virtualenv activate + command: > + source venv/bin/activate + environment: + PATH: {{ gettor_path }} + +- name: stop gettor + command: > + {{ gettor_path }}/bin gettor_service stop + +- name: start gettor + command: > + {{ gettor_path }}/bin gettor_service start diff --git a/roles/gettor/tasks/source.yml b/roles/gettor/tasks/source.yml index 33b7978..8fde7d2 100644 --- a/roles/gettor/tasks/source.yml +++ b/roles/gettor/tasks/source.yml @@ -4,20 +4,9 @@ path: "{{ gettor_path }}/.git/config" register: stat_result -- name: checkout some stuff - command: git checkout -- db/schema.rb locale - args: - chdir: "{{ gettor_path }}" - when: stat_result.stat.exists - - name: update gettor source git: repo: "{{ gettor_repo }}" dest: "{{ gettor_path }}" umask: '022' diff: false - when: not ansible_check_mode - notify: - - restart gitlab-mailroom - - restart gitlab-sidekiq - - reload gitlab-unicorn

1 0

[gettor/master] Update update_files
by hiro＠torproject.org 31 Aug '19

31 Aug '19

commit 01b3b39d895159cf8dceb8612b158981ca5779b4 Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 12:26:50 2019 +0200 Update update_files --- scripts/update_files | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/update_files b/scripts/update_files index b338a58..ce8fb88 100755 --- a/scripts/update_files +++ b/scripts/update_files @@ -10,6 +10,7 @@ # :license: This is Free Software. See LICENSE for license information. cd ~/releases +git checkout releases rm -f torbrowser-* TorBrowser-* tor-browser-* for row in $(

1 0

[gettor/master] Update update_files
by hiro＠torproject.org 31 Aug '19

31 Aug '19

commit 9d9af416b9e71d500894b0dd5f6b62ca8656a170 Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 12:25:11 2019 +0200 Update update_files --- scripts/update_files | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/update_files b/scripts/update_files index 681bf86..b338a58 100755 --- a/scripts/update_files +++ b/scripts/update_files @@ -24,7 +24,7 @@ for row in $( if [[ $r = *[!\ ]* ]]; then wget $r git fetch --all - git checkout -B releases + git checkout releases git add . git commit -m '[dist ci] commit from CI runner - update with new torbrowser downloads' diffs=$(git diff origin/releases) @@ -33,7 +33,7 @@ for row in $( else git push -f --follow-tags origin releases fi - git checkout -b torbrowser-releases + git checkout torbrowser-releases git merge releases diffs=$(git diff github/torbrowser-releases) if [ -z "$diffs" ]; then

1 0

[translation/snowflakeaddon-messages.json_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed
by translation＠torproject.org 31 Aug '19

31 Aug '19

commit f7809262b3225a58a22d92d87d0f799647cd7881 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 31 10:17:56 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- de/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/messages.json b/de/messages.json index f9de9d4cc..f6ed740cf 100644 --- a/de/messages.json +++ b/de/messages.json @@ -18,7 +18,7 @@ "message": "Number of users currently connected: $1" }, "popupStatusReady": { - "message": "Your Snowflake is ready to help users circumvent censorship!" + "message": "Your Snowflake is ready to help users circumvent censorship" }, "popupWebRTCOff": { "message": "WebRTC feature is not detected."

1 0

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 31 Aug '19

31 Aug '19

commit 238783de19c405647a5a0ab93b8e55af037a2778 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 31 10:17:50 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- de/messages.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de/messages.json b/de/messages.json index 0c322725f..4dc5bb579 100644 --- a/de/messages.json +++ b/de/messages.json @@ -12,13 +12,13 @@ "message": "Mehr erfahren" }, "popupStatusOff": { - "message": "Snowflake ist aus" + "message": "Snowflake ist ausgeschaltet" }, "popupStatusOn": { "message": "Anzahl der derzeit verbundenen Benutzer: $1" }, "popupStatusReady": { - "message": "Your Snowflake is ready to help users circumvent censorship" + "message": "Dein Snowflake ist bereit, Benutzern zu helfen, die Zensur zu umgehen." }, "popupWebRTCOff": { "message": "WebRTC-Fähigkeit nicht erkannt."

1 0

[gettor/master] Update permissions on scripts
by hiro＠torproject.org 31 Aug '19

31 Aug '19

commit 5cc1bf6f2d744eb0e53017652d5b529bf6a85641 Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 11:52:32 2019 +0200 Update permissions on scripts --- scripts/export_stats | 0 scripts/update_files | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/scripts/export_stats b/scripts/export_stats old mode 100644 new mode 100755 diff --git a/scripts/update_files b/scripts/update_files old mode 100644 new mode 100755

1 0

[gettor/master] Update update_files
by hiro＠torproject.org 31 Aug '19

31 Aug '19

commit 32d648ab63a8a264575b3d170b6f00e4b4985e71 Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 11:51:53 2019 +0200 Update update_files --- scripts/update_files | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/update_files b/scripts/update_files index 44584c7..681bf86 100644 --- a/scripts/update_files +++ b/scripts/update_files @@ -34,6 +34,7 @@ for row in $( git push -f --follow-tags origin releases fi git checkout -b torbrowser-releases + git merge releases diffs=$(git diff github/torbrowser-releases) if [ -z "$diffs" ]; then echo "No new releases"

1 0

[gettor/master] Modify update_files
by hiro＠torproject.org 31 Aug '19

31 Aug '19

commit 98875110127e134cf30a3495bb43d021a29c4e9f Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 11:41:03 2019 +0200 Modify update_files --- scripts/update_files | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/scripts/update_files b/scripts/update_files index ee9790b..44584c7 100644 --- a/scripts/update_files +++ b/scripts/update_files @@ -10,7 +10,6 @@ # :license: This is Free Software. See LICENSE for license information. cd ~/releases -git checkout -B releases rm -f torbrowser-* TorBrowser-* tor-browser-* for row in $( @@ -24,24 +23,22 @@ for row in $( ); if [[ $r = *[!\ ]* ]]; then wget $r + git fetch --all + git checkout -B releases + git add . + git commit -m '[dist ci] commit from CI runner - update with new torbrowser downloads' + diffs=$(git diff origin/releases) + if [ -z "$diffs" ]; then + echo "No new releases" + else + git push -f --follow-tags origin releases + fi + git checkout -b torbrowser-releases + diffs=$(git diff github/torbrowser-releases) + if [ -z "$diffs" ]; then + echo "No new releases" + else + git push -f --follow-tags github torbrowser-releases + fi fi; done - -git add . -git commit -m '[dist ci] commit from CI runner - update with new torbrowser downloads' -diffs=$(git diff origin/releases) -if [ -z "$diffs" ]; then - echo "No new releases" -else - git push -f --follow-tags origin releases -fi - -git fetch --all -git checkout -b torbrowser-releases - -diffs=$(git diff github/torbrowser-releases) -if [ -z "$diffs" ]; then - echo "No new releases" -else - git push -f --follow-tags github torbrowser-releases -fi

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 31 Aug '19

31 Aug '19

commit 11e7aaed3ae4aa7e96f63dcc675e57782d9c81c4 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 31 06:48:45 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- ru.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ru.po b/ru.po index b1bc25925..2382347ab 100644 --- a/ru.po +++ b/ru.po @@ -38,8 +38,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-14 14:11+0200\n" -"PO-Revision-Date: 2019-08-24 02:11+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-08-31 06:45+0000\n" +"Last-Translator: solokot <solokot(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0