May 2018 - tor-commits - lists.torproject.org

[tor/master] minor cleanups on commit 17daab76
by arma＠torproject.org 08 May '18

08 May '18

commit c3ae14549d48cf9266b6442cce3bb15df613a7a8 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue May 8 12:21:24 2018 -0400 minor cleanups on commit 17daab76 better punctuation and clearer wording --- src/or/hs_stats.c | 6 +++--- src/or/status.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/or/hs_stats.c b/src/or/hs_stats.c index 3e183a5bf..1e2a96945 100644 --- a/src/or/hs_stats.c +++ b/src/or/hs_stats.c @@ -3,7 +3,7 @@ /** * \file hs_stats.c - * \brief Keeps stats about the activity of our hidden service. + * \brief Keeps stats about the activity of our onion service(s). **/ #include "or.h" @@ -42,14 +42,14 @@ hs_stats_get_n_introduce2_v2_cells(void) return n_introduce2_v2; } -/** Note that we attempted to launch another circuit to a rendezvous point */ +/** Note that we attempted to launch another circuit to a rendezvous point. */ void hs_stats_note_service_rendezvous_launch(void) { n_rendezvous_launches++; } -/** Return the number of rendezvous circuits we have attempted to launch */ +/** Return the number of rendezvous circuits we have attempted to launch. */ uint32_t hs_stats_get_n_rendezvous_launches(void) { diff --git a/src/or/status.c b/src/or/status.c index 4c497739e..4b8033d11 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -87,19 +87,19 @@ bytes_to_usage(uint64_t bytes) return bw_string; } -/** Log some usage info about our hidden service */ +/** Log some usage info about our onion service(s). */ static void log_onion_service_stats(void) { unsigned int num_services = hs_service_get_num_services(); - /* If there are no active hidden services, no need to print logs */ + /* If there are no active onion services, no need to print logs */ if (num_services == 0) { return; } log_notice(LD_HEARTBEAT, - "Our hidden service%s received %u v2 and %u v3 INTRODUCE2 cells " + "Our onion service%s received %u v2 and %u v3 INTRODUCE2 cells " "and attempted to launch %d rendezvous circuits.", num_services == 1 ? "" : "s", hs_stats_get_n_introduce2_v2_cells(),

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 08 May '18

08 May '18

commit 69d4373182dcbdd56e35e35e8763f9e0436bb652 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 8 11:45:49 2018 +0000 Update translations for liveusb-creator_completed --- ru/ru.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index 9ab550183..258c6893b 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -18,6 +18,7 @@ # Oul Gocke <beandonlybe(a)yandex.ru>, 2013-2014 # Roberto Brigante, 2017 # Sergey Briskin, 2014 +# sgtStrom, 2018 # tavarysh <tavarysh(a)riseup.net>, 2013 # Vladimir.Serykh <Vladimir.Serykh(a)extenza-studio.ru>, 2015 # vlasok <vlasok1987(a)yandex.ru>, 2012 @@ -30,8 +31,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-10 15:57+0100\n" -"PO-Revision-Date: 2018-04-12 18:59+0000\n" -"Last-Translator: IDRASSI Mounir <mounir.idrassi(a)idrix.fr>\n" +"PO-Revision-Date: 2018-05-08 11:20+0000\n" +"Last-Translator: sgtStrom\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" @@ -45,7 +46,7 @@ msgstr "Вы должны запустить приложение с root пра #: ../tails_installer/creator.py:147 msgid "Extracting live image to the target device..." -msgstr "Извлеките образ на необходимом устройстве..." +msgstr "Извлечение образа на целевое устройство..." #: ../tails_installer/creator.py:154 #, python-format

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 08 May '18

08 May '18

commit 9da93d8055227e14fdb744518f15065c77a83065 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 8 11:45:42 2018 +0000 Update translations for liveusb-creator --- ru/ru.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index 9ab550183..258c6893b 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -18,6 +18,7 @@ # Oul Gocke <beandonlybe(a)yandex.ru>, 2013-2014 # Roberto Brigante, 2017 # Sergey Briskin, 2014 +# sgtStrom, 2018 # tavarysh <tavarysh(a)riseup.net>, 2013 # Vladimir.Serykh <Vladimir.Serykh(a)extenza-studio.ru>, 2015 # vlasok <vlasok1987(a)yandex.ru>, 2012 @@ -30,8 +31,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-10 15:57+0100\n" -"PO-Revision-Date: 2018-04-12 18:59+0000\n" -"Last-Translator: IDRASSI Mounir <mounir.idrassi(a)idrix.fr>\n" +"PO-Revision-Date: 2018-05-08 11:20+0000\n" +"Last-Translator: sgtStrom\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" @@ -45,7 +46,7 @@ msgstr "Вы должны запустить приложение с root пра #: ../tails_installer/creator.py:147 msgid "Extracting live image to the target device..." -msgstr "Извлеките образ на необходимом устройстве..." +msgstr "Извлечение образа на целевое устройство..." #: ../tails_installer/creator.py:154 #, python-format

1 0

[translation/tor-and-https_completed] Update translations for tor-and-https_completed
by translation＠torproject.org 08 May '18

08 May '18

commit b60d5b92c435978909c73c119c9df6a785f38c7d Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 8 11:17:40 2018 +0000 Update translations for tor-and-https_completed --- fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr.po b/fr.po index 198029d0c..57815b6d2 100644 --- a/fr.po +++ b/fr.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" -"PO-Revision-Date: 2018-04-12 19:08+0000\n" -"Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" +"PO-Revision-Date: 2018-05-08 11:15+0000\n" +"Last-Translator: Madeline Earp <madelineearp(a)gmail.com>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 08 May '18

08 May '18

commit fe8329719fadc950d69bfddbaa8d1d82a14aa8c1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 8 11:17:36 2018 +0000 Update translations for tor-and-https --- fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr.po b/fr.po index 198029d0c..57815b6d2 100644 --- a/fr.po +++ b/fr.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" -"PO-Revision-Date: 2018-04-12 19:08+0000\n" -"Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" +"PO-Revision-Date: 2018-05-08 11:15+0000\n" +"Last-Translator: Madeline Earp <madelineearp(a)gmail.com>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tor-browser-build/master] Bug 25318: Add Tor Browser nightly builds email notification
by gk＠torproject.org 08 May '18

08 May '18

commit 4580c03c937e8ccab86446d60a0d4ee29b7c07c8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 23 13:35:39 2018 +0200 Bug 25318: Add Tor Browser nightly builds email notification Authentication configuration for the email setup is stored in group_vars/boklm-tbb-nightly/dma-auth.yml, encrypted using ansible-vault. The file contains the dma_auth_conf variable, which is the content of the /etc/dma/auth.conf file. --- tools/ansible/Makefile | 2 +- tools/ansible/boklm-tbb-nightly-build.yml | 1 + .../ansible/group_vars/boklm-tbb-nightly/dma-auth.yml | 10 ++++++++++ tools/ansible/group_vars/boklm-tbb-nightly/dma.yml | 8 ++++++++ .../group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 2 ++ tools/ansible/roles/mta/tasks/main.yml | 18 ++++++++++++++++++ .../roles/tbb-nightly-build/templates/testsuite-config | 5 +++++ 7 files changed, 45 insertions(+), 1 deletion(-) diff --git a/tools/ansible/Makefile b/tools/ansible/Makefile index 72deb5b..ea63a44 100644 --- a/tools/ansible/Makefile +++ b/tools/ansible/Makefile @@ -5,4 +5,4 @@ fpcentral: ANSIBLE_CONFIG='$((a)D)/ansible-fpcentral.cfg' ansible-playbook -i inventory --ask-become-pass fpcentral.yml boklm-tbb-nightly-build: - ansible-playbook -i inventory boklm-tbb-nightly-build.yml + ansible-playbook --vault-password-file=~/ansible-vault/boklm-tbb-nightly -i inventory boklm-tbb-nightly-build.yml diff --git a/tools/ansible/boklm-tbb-nightly-build.yml b/tools/ansible/boklm-tbb-nightly-build.yml index cc37e23..2fe48cd 100644 --- a/tools/ansible/boklm-tbb-nightly-build.yml +++ b/tools/ansible/boklm-tbb-nightly-build.yml @@ -5,3 +5,4 @@ - role: tbb-builder - role: tbb-nightly-build - role: unattended-upgrades + - role: mta diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml b/tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml new file mode 100644 index 0000000..254291c --- /dev/null +++ b/tools/ansible/group_vars/boklm-tbb-nightly/dma-auth.yml @@ -0,0 +1,10 @@ +$ANSIBLE_VAULT;1.1;AES256 +64353537366566623534653938363036396164303631616138313130663766626463303034336564 +6339346639633765383534653561646366626665393333340a343533636436333838633039363265 +33393762363563323338356634396137393466616336326337323761643332363438313735646135 +6633326462616261310a663738306463613237326164663533326230316662333935333361636334 +61336433633964643631653230633861393131646532666536653738376261386535356636666262 +30303761333230623662323037376130386134373939613861343233363038636464623132363135 +66386532346165303839346563383934633462386534383330636432356166666238383332353930 +39316439653733376239343661373265303033323237366132366161316535636165336539333130 +3033 diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml b/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml new file mode 100644 index 0000000..b210a3a --- /dev/null +++ b/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml @@ -0,0 +1,8 @@ +--- +dma_conf: | + SMARTHOST mail.riseup.net + AUTHPATH /etc/dma/auth.conf + SECURETRANSFER + STARTTLS + MAILNAME /etc/mailname + MASQUERADE boklm-tbb-nightly(a)riseup.net diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml index ebaadfe..77c4ad6 100644 --- a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -1,3 +1,5 @@ --- nightly_build_hostname: f4amtbsowhix7rrf.onion nightly_build_url: 'http://{{ nightly_build_hostname }}' +nightly_build_email_from: "'Tor Browser Nightly Builds (boklm) <boklm-tbb-nightly(a)riseup.net>'," +nightly_build_email_to: "[ 'boklm(a)torproject.org', 'gk(a)torproject.org' ]," diff --git a/tools/ansible/roles/mta/tasks/main.yml b/tools/ansible/roles/mta/tasks/main.yml index de469d8..9c5ac49 100644 --- a/tools/ansible/roles/mta/tasks/main.yml +++ b/tools/ansible/roles/mta/tasks/main.yml @@ -4,3 +4,21 @@ apt: name: dma state: present + +- name: create dma auth.conf + copy: + dest: /etc/dma/auth.conf + mode: 0640 + owner: root + group: mail + content: "{{ dma_auth_conf }}" + when: dma_auth_conf is defined + +- name: create dma.conf + copy: + dest: /etc/dma/dma.conf + mode: 0640 + owner: root + group: mail + content: "{{ dma_conf }}" + when: dma_conf is defined diff --git a/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config index b537f56..c07c52c 100644 --- a/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config +++ b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config @@ -23,5 +23,10 @@ my %res = ( name => $name, args => [ $testsuite ], tags => [ 'nightly' ], + 'reports-url' => '{{ nightly_build_url }}/reports/', + 'email-subject' => '[build result: [% success ? "ok" : "failed" %]] [% options.name %]', + {% if nightly_build_email_to is defined %}'email-report' => 1,{% endif %} + {% if nightly_build_email_to is defined %}'email-to' => {{ nightly_build_email_to }}{% endif %} + {% if nightly_build_email_from is defined %}'email-from' => {{ nightly_build_email_from }}{% endif %} ); %res;

1 0

[tor-browser-build/master] Bug 25817: add ansible roles for tbb-nightly setup
by gk＠torproject.org 08 May '18

08 May '18

commit a2f565643d4c34a49712c37e3931dd6f80da7ba1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 16 19:30:02 2018 +0200 Bug 25817: add ansible roles for tbb-nightly setup --- README | 43 ++------ tools/ansible/Makefile | 3 + tools/ansible/README | 6 ++ tools/ansible/boklm-tbb-nightly-build.yml | 7 ++ .../boklm-tbb-nightly/tbb-nightly-build.yml | 3 + tools/ansible/inventory | 4 + .../roles/tbb-nightly-build/defaults/main.yml | 11 ++ .../roles/tbb-nightly-build/handlers/main.yml | 5 + .../ansible/roles/tbb-nightly-build/tasks/main.yml | 84 +++++++++++++++ .../roles/tbb-nightly-build/templates/nginx.conf | 16 +++ .../tbb-nightly-build/templates/rbm.local.conf | 116 +++++++++++++++++++++ .../tbb-nightly-build/templates/start-tbb-nightly | 5 + .../tbb-nightly-build/templates/testsuite-config | 27 +++++ .../tbb-nightly-build/templates/www-index.html | 10 ++ 14 files changed, 306 insertions(+), 34 deletions(-) diff --git a/README b/README index d498c05..a20b659 100644 --- a/README +++ b/README @@ -138,43 +138,18 @@ Automated builds using tbb-testsuite ------------------------------------ The Tor Browser testsuite scripts can also be used to do nightly builds -and publish the build logs. +and publish the build logs. The recommended way to do that is to use +the ansible roles from the tools/ansible directory. See next section +for details. -If you want to do that, start by cloning the git repository: - $ git clone https://git.torproject.org/boklm/tor-browser-bundle-testsuite.git +Using ansible to set up a nightly build machine +----------------------------------------------- -Install some dependencies: - - # apt-get install -y libdata-dump-perl libfile-slurp-perl \ - libio-captureoutput-perl perlmagick libjson-perl \ - libwww-perl liblwp-protocol-https-perl libtemplate-perl \ - libyaml-syck-perl libdatetime-perl \ - libemail-sender-perl libemail-simple-perl libfile-type-perl \ - libipc-run-perl libxml-libxml-perl - -Copy the config/tor-browser_build-boklm file and edit it: - - $ cd tor-browser-bundle-testsuite - $ cp config/tor-browser_build-boklm config/tor-browser_build-$user - $ vim config/tor-browser_build-$user - -Change the publish_dir and publish_url options. The publish_dir option is -the local directory where the builds will be stored. The publish_url -option is the public URL where the builds will be available. - -Copy the tools/tor-browser-builds-boklm file and edit it to change the ---config= option: - - $ cp tools/tor-browser-builds-boklm tools/tor-browser-builds-$user - $ vim tools/tor-browser-builds-$user - -You can now run ./tools/tor-browser-builds-$user to start the build, and -add it to your crontab. - -The html build reports will be available in the reports/ directory, and -the build files in the tor-browser-builds/ directory (unless you changed -the publish_dir option). +The directory tools/ansible contains some ansible roles to set up a +nightly build machine. You can look at the playbook defined in +boklm-tbb-nightly-build.yml and variables in group_vars/boklm-tbb-nightly/ +for an example of how it can be used. Signing builds diff --git a/tools/ansible/Makefile b/tools/ansible/Makefile index 608f932..72deb5b 100644 --- a/tools/ansible/Makefile +++ b/tools/ansible/Makefile @@ -3,3 +3,6 @@ ansible-tbb-build: fpcentral: ANSIBLE_CONFIG='$((a)D)/ansible-fpcentral.cfg' ansible-playbook -i inventory --ask-become-pass fpcentral.yml + +boklm-tbb-nightly-build: + ansible-playbook -i inventory boklm-tbb-nightly-build.yml diff --git a/tools/ansible/README b/tools/ansible/README index 6b2e6a4..dc69ad7 100644 --- a/tools/ansible/README +++ b/tools/ansible/README @@ -16,3 +16,9 @@ fpcentral: you need to be in the fpcentral tpo ldap group. Your ldap password will be asked, to sudo to the fpcentral user. +boklm-tbb-nightly-build: + This target is used by boklm to deploy a nightly build machine. If + anybody else wants to set up their own nightly builds, it is possible to + do it by adding a new host to the inventory file and making copies of + group_vars/boklm-tbb-nightly/ and boklm-tbb-nightly-build.yml. + diff --git a/tools/ansible/boklm-tbb-nightly-build.yml b/tools/ansible/boklm-tbb-nightly-build.yml new file mode 100644 index 0000000..cc37e23 --- /dev/null +++ b/tools/ansible/boklm-tbb-nightly-build.yml @@ -0,0 +1,7 @@ +--- + +- hosts: boklm-tbb-nightly-build + roles: + - role: tbb-builder + - role: tbb-nightly-build + - role: unattended-upgrades diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml new file mode 100644 index 0000000..ebaadfe --- /dev/null +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -0,0 +1,3 @@ +--- +nightly_build_hostname: f4amtbsowhix7rrf.onion +nightly_build_url: 'http://{{ nightly_build_hostname }}' diff --git a/tools/ansible/inventory b/tools/ansible/inventory index 32a5805..fc25842 100644 --- a/tools/ansible/inventory +++ b/tools/ansible/inventory @@ -1,8 +1,12 @@ build-sunet-a ansible_ssh_user=root ansible_ssh_host=build-sunet-a.torproject.net fpcentral ansible_become=True ansible_become_method=sudo ansible_become_user=fpcentral ansible_ssh_host=forrestii.torproject.org allow_world_readable_tmpfiles=True +boklm-tbb-nightly-build ansible_ssh_user=root ansible_become_method=su [tbb-build] build-sunet-a [fpcentral] fpcentral + +[boklm-tbb-nightly] +boklm-tbb-nightly-build diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml new file mode 100644 index 0000000..d84a161 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -0,0 +1,11 @@ +--- +nightly_build_user: tbb-nightly +nightly_build_cron_hour: 2 +nightly_build_cron_minute: 20 +nightly_build_keep_builds: 2 +testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" +testsuite_git_url: https://git.torproject.org/boklm/tor-browser-bundle-testsuite.git +testsuite_git_commit: 348ad855711382089c4fbf1badfec58e31a6c148 +nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" +nightly_build_nginx_enable: true +nightly_build_nginx_listen: 127.0.0.1:80 diff --git a/tools/ansible/roles/tbb-nightly-build/handlers/main.yml b/tools/ansible/roles/tbb-nightly-build/handlers/main.yml new file mode 100644 index 0000000..3350d73 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/handlers/main.yml @@ -0,0 +1,5 @@ +--- +- name: restart nginx + service: + name: nginx + state: restarted diff --git a/tools/ansible/roles/tbb-nightly-build/tasks/main.yml b/tools/ansible/roles/tbb-nightly-build/tasks/main.yml new file mode 100644 index 0000000..64d31a9 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/tasks/main.yml @@ -0,0 +1,84 @@ +--- +- name: create tbb-nightly user + user: + name: "{{ nightly_build_user }}" + comment: "Tor Browser Nightly Builds" + groups: tbb-build + createhome: yes + home: "/home/{{ nightly_build_user }}" + +- name: clone tor browser testsuite + become: yes + become_user: "{{ nightly_build_user }}" + git: + repo: "{{ testsuite_git_url }}" + dest: "{{ testsuite_dir }}" + version: "{{ testsuite_git_commit }}" + +- name: install testsuite dependencies + command: "{{ testsuite_dir }}/install-deps" + +- name: add testsuite config + template: + src: testsuite-config + dest: "{{ testsuite_dir }}/config/tbb-nightly" + mode: 0644 + owner: "{{ nightly_build_user }}" + +- name: create rbm-config directory + file: + path: '{{ testsuite_dir }}/rbm-config/' + state: directory + owner: '{{ nightly_build_user }}' + mode: 0755 + +- name: add rbm config + template: + src: rbm.local.conf + dest: "{{ testsuite_dir }}/rbm-config/tbb-nightly.rbm.local.conf" + mode: 0644 + owner: "{{ nightly_build_user }}" + +- name: add start-tbb-nightly script + template: + src: start-tbb-nightly + dest: "/home/{{ nightly_build_user }}/start-tbb-nightly" + mode: 0755 + owner: "{{ nightly_build_user }}" + +- name: add cron to start nighly build + cron: + name: tbb-nightly-build + user: "{{ nightly_build_user }}" + hour: "{{ nightly_build_cron_hour }}" + minute: "{{ nightly_build_cron_minute }}" + job: "/home/{{ nightly_build_user }}/start-tbb-nightly" + +- name: create wwwdir + file: + path: '{{ nightly_build_wwwdir }}' + state: directory + owner: '{{ nightly_build_user }}' + mode: 0755 + +- name: add index page + template: + src: www-index.html + dest: "{{ nightly_build_wwwdir }}/index.html" + mode: 0644 + owner: "{{ nightly_build_user }}" + +- name: install nginx + apt: + name: nginx + state: present + when: nightly_build_nginx_enable + +- name: add nginx config + template: + src: nginx.conf + dest: /etc/nginx/sites-enabled/tbb-nightly-build + mode: 0644 + notify: + - restart nginx + when: nightly_build_nginx_enable diff --git a/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf b/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf new file mode 100644 index 0000000..9d44bec --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf @@ -0,0 +1,16 @@ +server { + listen {{ nightly_build_nginx_listen }}; + server_name {{ nightly_build_hostname }}; + root {{ nightly_build_wwwdir }}; + index index.html; + location / { + try_files $uri $uri/ =404; + } + location /reports { + alias {{ testsuite_dir }}/reports; + } + location /tor-browser-builds { + alias {{ testsuite_dir }}/tor-browser-builds; + autoindex on; + } +} diff --git a/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf b/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf new file mode 100644 index 0000000..fcd6b34 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf @@ -0,0 +1,116 @@ +--- +### This file is used to override options from rbm.conf to adapt them +### to your local setup. +### +### Copy this file as rbm.local.conf to enable it, and uncomment the +### options you want to modify. + + +### The tmp_dir option defines where temporary files are stored. The +### builds are made from this directory, so using a directory on a fast +### disk can improve build time. By default we are using a tmp directory +### under the tor-browser-build directory. +#tmp_dir: /tmp + +### The debug option defines whether a debugging shell should be opened +### automatically in the build directory/container in case of build +### failure. If you are doing automated builds, you might want to disable +### this. +#debug: 0 + +### The build_log option defines in which file the build logs of each +### component are stored. If you set it to '-' the logs are output on +### stdout and stderr. +#build_log: '-' + +### By default, the logs from previous builds are kept in the log files. +### If you set build_log_append to 0, then previous logs are cleaned +### when starting a new build. +#build_log_append: 0 + +buildconf: + buildconf: 1 + + ### The buildconf/num_procs option can be used to select the number of + ### build processes to run simultaneously. You can also use the + ### RBM_NUM_PROCS environment variable. The default is 4. + #num_procs: 8 + + ### The buildconf/git_signtag_opt option is useful when you tag a release. + ### It is used to set the 'git tag' argument to select the keyid for + ### signing the tag. + #git_signtag_opt: '-u keyid' + +var: + local_conf: 1 + + ### The var/sign_build option defines if you want to sign the + ### sha256sums-unsigned-build.txt file with gpg. + #sign_build: 1 + + ### The var/sign_build_gpg_opts option can be used to define some gpg + ### options to select the key to use to sign the sha256sums-unsigned-build.txt + ### file. + #sign_build_gpg_opts: '--local-user XXXXXXXX' + + ### The clean configuration is used by the cleaning script to find the + ### branches and build targets you are using, to compute the list of + ### files that should be kept. + ### + ### If you only do alpha builds for all platforms, you can use the + ### following configuration: + clean: + HEAD: + - project: release + target: + - alpha + - torbrowser-all + - project: release + target: + - nightly + - torbrowser-all + # + ### If you are doing 'release' builds in the maint-7.0 branch and + ### 'alpha' builds in the master branch, you can use the following + ### configuration: + #clean: + # master: + # - project: release + # target: + # - alpha + # - torbrowser-all + # maint-7.0: + # - project: release + # target: + # - release + # - torbrowser-all + +targets: + + ### testbuild is based on alpha by default. Uncomment this if you want it + ### to be based on nightly. + #torbrowser-testbuild: + # - testbuild + # - nightly + + testbuild: + var: + testbuild: 1 + + ### Uncomment this if you want to create mar files in your test build. + #build_mar: 1 + + nightly: + + ### By default 'fetch' is set to 1 for nightly builds, meaning that new + ### commits will be fetched automatically during each build. You can + ### disable this during development if you want to do rebuilds to test + ### a specific change, but don't want rebuilds caused by unrelated + ### changes, or if you want to decide at which point new commits are + ### fetched. When 'fetch' is set to 'if_needed', new commits will only + ### be fetched if the selected commit (or branch, or tag) is not present, + ### which means that existing branches won't be updated. In that case + ### you can fetch new commits by running 'make fetch'. + fetch: 'if_needed' + +# vim: filetype=yaml sw=2 diff --git a/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly b/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly new file mode 100644 index 0000000..3c1847d --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/start-tbb-nightly @@ -0,0 +1,5 @@ +#!/bin/sh +cd {{ testsuite_dir }} +export RBM_NO_DEBUG=1 +./tbb-testsuite --config=tbb-nightly "$@" +./tools/prune-old-builds/prune-old-builds --prefix '' --days {{ nightly_build_keep_builds }} ./tor-browser-builds diff --git a/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config new file mode 100644 index 0000000..b537f56 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/testsuite-config @@ -0,0 +1,27 @@ +# vim: filetype=perl expandtab +use strict; +use FindBin; +use DateTime; +use TBBTestSuite::TestSuite::TorBrowserBuild; + +my $date = DateTime->now->ymd; +my $name = "tor-browser-$date"; + +if (-d "$options->{'reports-dir'}/r/$name") { + print "Doing nothing: $name already done\n"; + return ( args => [] ); +} + +my $testsuite = TBBTestSuite::TestSuite::TorBrowserBuild->new({ + publish_dir => "$FindBin::Bin/tor-browser-builds/$date", + publish_url => "{{ nightly_build_url }}/tor-browser-builds/$date", + rbm_local_conf => "$FindBin::Bin/rbm-config/tbb-nightly.rbm.local.conf", + make_clean => 1, + }); + +my %res = ( + name => $name, + args => [ $testsuite ], + tags => [ 'nightly' ], +); +%res; diff --git a/tools/ansible/roles/tbb-nightly-build/templates/www-index.html b/tools/ansible/roles/tbb-nightly-build/templates/www-index.html new file mode 100644 index 0000000..05050d8 --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/www-index.html @@ -0,0 +1,10 @@ +<html> +<head> + <title>Tor Browser Nightly Builds</title> +</head> +<body> + <h1>Tor Browser Nightly Builds</title> + <a href="reports/"><h3>Build Reports</h3></a> + <a href="tor-browser-builds/"><h3>Build files</h3></a> +</body> +</html>

1 0

[translation/support-connecting] Update translations for support-connecting
by translation＠torproject.org 08 May '18

08 May '18

commit 3019288eb5dec7befeea1b05ec1d689afdd18043 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 8 06:19:53 2018 +0000 Update translations for support-connecting --- bn_BD.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bn_BD.json b/bn_BD.json index 9d86e19ce..217af122b 100644 --- a/bn_BD.json +++ b/bn_BD.json @@ -14,7 +14,7 @@ "connecting-3": { "id": "# সংযোগ হচ্ছে-3", "control": "সংযোগ হচ্ছে-3", - "title": "I cannot reach X.onion!", - "description": "<p class=\"mb-3\">If you cannot reach the onion service you desire, make sure that you have entered the 16-character onion address correctly: even a small mistake will stop Tor Browser from being able to reach the site. If you are still unable to connect to the onion service, please try again later. There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning.</p><p class=\"mb-3\">You can also ensure that you're able to access other onion services by connecting to <a href=\"http://3g2upl4pq6kufc4m.onion\">DuckDuckGo</a>'s Onion Service.</p>" + "title": "আমি X.onion এ পৌঁছাতে পারছি না!", + "description": "যদি আপনি পেঁয়াজ পরিষেবাতে পৌঁছাতে না পারেন, তবে নিশ্চিত করুন যে আপনি 16-অক্ষরের পেঁয়াজের ঠিকানায় সঠিকভাবে প্রবেশ করেছেন: এমনকি একটি ছোট ভুল টর্ ব্রাউজারটি সাইটে পৌঁছাতে সক্ষম হবেনা। যদি আপনি এখনও পেঁয়াজ পরিষেবা সংযোগ করতে অক্ষম হন, তাহলে পরে আবার চেষ্টা করুন। একটি অস্থায়ী সংযোগ সমস্যা হতে পারে, বা সাইট অপারেটর এটি সতর্কবার্তা ছাড়াই অফলাইনে যেতে অনুমতি দেওয়া হতে পারে। আপনি আপনি DuckDuckGo এর পেঁয়াজ পরিষেবা সংযোগ করে অন্য পেঁয়াজ পরিষেবা অ্যাক্সেস করতে পারবেন তা নিশ্চিত করতে পারেন।" } }

1 0

[translation/support-tbb] Update translations for support-tbb
by translation＠torproject.org 08 May '18

08 May '18

commit 811b04a2ff8db588d28d1fc75578f33d8bae063d Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 8 05:20:54 2018 +0000 Update translations for support-tbb --- bn_BD.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bn_BD.json b/bn_BD.json index 8b789a998..c25b442b9 100644 --- a/bn_BD.json +++ b/bn_BD.json @@ -122,7 +122,7 @@ "tbb-20": { "id": "#tbb-20", "control": "tbb-20", - "title": "Tor Browser won't connect, but it doesn’t seem to be an issue with censorship.", + "title": "টর ব্রাউজার সংযোগ করবে না, তবে এটি সেন্সরশিপের সাথে একটি সমস্যা বলে মনে হচ্ছে না।", "description": "<p class=\"mb-3\">One of the most common issues that causes connection errors in Tor Browser is an incorrect system clock. Please make sure your system clock and timezone are set accurately. If this doesn't fix the problem, see the Troubleshooting page on the <mark><a href=\"https://tb-manual.torproject.org/en-US/bridges.html\">Tor Browser manual</a></mark>.</p>" }, "tbb-21": {

1 0

[translation/support-connecting] Update translations for support-connecting
by translation＠torproject.org 08 May '18

08 May '18

commit e6df53a64b29eba5bc614c9aece1c92d0ab1d4e0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 8 05:20:17 2018 +0000 Update translations for support-connecting --- bn_BD.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bn_BD.json b/bn_BD.json index 1d53adab5..9d86e19ce 100644 --- a/bn_BD.json +++ b/bn_BD.json @@ -1,19 +1,19 @@ { "connecting-1": { - "id": "#connecting-1", - "control": "connecting-1", - "title": "Tor Browser won't connect, but it doesn’t seem to be an issue with censorship.", + "id": "# সংযোগ হচ্ছে-1", + "control": "সংযোগ হচ্ছে-1", + "title": "টর ব্রাউজার সংযোগ করবে না, তবে এটি সেন্সরশিপের সাথে একটি সমস্যা বলে মনে হচ্ছে না।", "description": "<p class=\"mb-3\">One of the most common issues that causes connection errors in Tor Browser is an incorrect system clock. Please make sure your system clock and timezone are set accurately. If this doesn't fix the problem, see the Troubleshooting page on the <mark><a href=\"https://tb-manual.torproject.org/en-US/bridges.html\">Tor Browser manual</a></mark>.</p>" }, "connecting-2": { - "id": "#connecting-2", - "control": "connecting-2", - "title": "আমি টর সংযোগে সমস্যা হচ্ছে, এবং আমি কি ভুল বুঝতে পারছি না।", + "id": "# সংযোগ হচ্ছে-2", + "control": "# সংযোগ হচ্ছে-2", + "title": "আমার টর এর সাথে সংযোগে সমস্যা হচ্ছে, এবং আমি কি ভুল বুঝতে পারছি না।", "description": "<p class=\"mb-3\">If you’re having trouble connecting, please select the option to \"copy Tor log to clipboard.\" Then paste the Tor log into a text file or other document. You should see one of these common log errors (look for the following lines in your Tor log):</p><h5>Common log error #1: Proxy connection failure</h5><p class=\"mb-3\"><pre><code> 2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: Connecting to directory server \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\") \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\") \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server fa ilure\")</code></pre></p><p class=\"mb-3\">If you see lines like these in your Tor log, it means you are failing to connect to a SOCKS proxy. If a SOCKS proxy is required for your network setup, then please make sure you’ve entered your proxy details correctly. If a SOCKS proxy is not required, or you’re not sure, please try connecting to the Tor network without a SOCKS proxy.<p><h5>Common log error #2: Can’t reach guard relays</h5><p class=\"mb-3\"><pre><code> 11/1/2017 21:11:43 PM.500 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 11/1/2017 21:11:44 PM.300 [NOTICE] Bootstrapped 80%: Connecting to the Tor network \n 11/1/2017 21:11:44 PM.300 [WARN] Failed to find node for hop 0 of our path. Discarding this circuit. \n 11/1/2017 21:11:44 PM.500 [NOTICE] Bootstrapped 85%: Finishing handshake with first hop \n 11/1/2017 21:11:45 PM.300 [WARN] Failed to find node for hop 0 of our path. Discarding this circuit.</code></pre></p><p class=\"mb-3\">If you see lines like these in your Tor log, it means your Tor failed to connect to the first node in the Tor circuit. This could mean that you’re on a network that’s censored. Please try connecting with bridges, and that should fix the problem.</p><h5>Common log error #3: Failed to complete TLS handshake</h5><p class=\"mb-3\"><pre><code> 13-11-17 19:52:24.300 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \n 13-11-17 19:53:49.300 [WARN] Problem bootstrapping. Stuck at 10%: Finishing handshake with directory server. (DONE; DONE; count 10; recommendation warn; host [host] at xxx.xxx.xxx.xx:xxx) \n 13-11-17 19:53:49.300 [WARN] 10 connections have failed: \n 13-11-17 19:53:49.300 [WARN] 9 connections died in state handshaking (TLS) with SSL state SSLv2/v3 read server hello A in HANDSHAKE \n 13-11-17 19:53:49.300 [WARN] 1 connections died in state connect()ing with SSL state (No SSL object)</code></pre></p><p class=\"mb-3\">If you see lines like this in your Tor log, it means that Tor failed to complete a TLS handshake with the directory authorities. Using bridges will likely fix this.</p><h5>Common log error #4: Clock skew</h5><p class=\"mb-3\"><pre><code> 19.11.2017 00:04:47.400 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 19.11.2017 00:04:48.000 [NOTICE] Bootstrapped 5%: Connecting to directory server \n 19.11.2017 00:04:48.200 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \n 19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time (OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours, 1 minutes, or that theirs is ahead. \n Tor requires an accurate clock to work: please check your time, timezone, and date settings.</code></pre></p><p class=\"mb-3\">If you see lines like this in your Tor log, it means your system clock is incorrect. Please make sure your clock is set accurately, including the correct timezone. Then restart Tor. </p>" }, "connecting-3": { - "id": "#connecting-3", - "control": "connecting-3", + "id": "# সংযোগ হচ্ছে-3", + "control": "সংযোগ হচ্ছে-3", "title": "I cannot reach X.onion!", "description": "<p class=\"mb-3\">If you cannot reach the onion service you desire, make sure that you have entered the 16-character onion address correctly: even a small mistake will stop Tor Browser from being able to reach the site. If you are still unable to connect to the onion service, please try again later. There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning.</p><p class=\"mb-3\">You can also ensure that you're able to access other onion services by connecting to <a href=\"http://3g2upl4pq6kufc4m.onion\">DuckDuckGo</a>'s Onion Service.</p>" }

1 0