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

[gettor/master] Update gettor tasks
by hiro＠torproject.org 01 Sep '19

01 Sep '19

commit b0b3581d0ee03302f40c17f51ea12fbc2e21b5cc Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 16:35:31 2019 +0200 Update gettor tasks --- roles/gettor/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index 79001fc..fadacb6 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -31,10 +31,10 @@ - name: stop gettor command: > - {{ gettor_path }}/venv/bin/python3 ./bin gettor_service stop + ./bin gettor_service stop args: chdir: "{{ gettor_path }}" - name: start gettor command: > - {{ gettor_path }}/venv/bin/python3 ./bin gettor_service start + ./bin gettor_service start

1 0

[gettor/master] Update gettor tasks
by hiro＠torproject.org 01 Sep '19

01 Sep '19

commit 4f962ec5954729ccff09aea587d818e42a291e7b Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 16:33:56 2019 +0200 Update gettor tasks --- roles/gettor/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index a23d67d..79001fc 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -31,10 +31,10 @@ - name: stop gettor command: > - {{ gettor_path }}/venv/bin/python3 {{ gettor_path }}/bin gettor_service stop + {{ gettor_path }}/venv/bin/python3 ./bin gettor_service stop args: chdir: "{{ gettor_path }}" - name: start gettor command: > - {{ gettor_path }}/venv/bin/python3 {{ gettor_path }}/bin gettor_service start + {{ gettor_path }}/venv/bin/python3 ./bin gettor_service start

1 0

[gettor/master] Update gettor tasks
by hiro＠torproject.org 01 Sep '19

01 Sep '19

commit 3124c2a1b68d618fce20d02de3fc113fac2e1f70 Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 16:32:51 2019 +0200 Update gettor tasks --- roles/gettor/tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index 4212be2..a23d67d 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -32,7 +32,8 @@ - name: stop gettor command: > {{ gettor_path }}/venv/bin/python3 {{ gettor_path }}/bin gettor_service stop - + args: + chdir: "{{ gettor_path }}" - name: start gettor command: >

1 0

[gettor/master] Update gettor tasks
by hiro＠torproject.org 01 Sep '19

01 Sep '19

commit e97894fdd69cbd2c05e753e8b1972c1aec90c7ad Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 16:31:57 2019 +0200 Update gettor tasks --- roles/gettor/tasks/main.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index 14a1b50..4212be2 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -21,25 +21,19 @@ args: chdir: "{{ gettor_path }}" -- name: activate virtualenv - shell: > - source {{ gettor_path }}/venv/bin/activate - args: - chdir: "{{ gettor_path }}" - - name: create database command: > - {{ gettor_path }}/scripts/create_db -n -c -o + {{ gettor_path }}/venv/bin/python3 {{ gettor_path }}/scripts/create_db -n -c -o - name: add links command: > - {{ gettor_path }}/scripts/add_links_to_db -f gettor.db + {{ gettor_path }}/venv/bin/python3 {{ gettor_path }}/scripts/add_links_to_db -f gettor.db - name: stop gettor command: > - {{ gettor_path }}/bin gettor_service stop + {{ gettor_path }}/venv/bin/python3 {{ gettor_path }}/bin gettor_service stop - name: start gettor command: > - {{ gettor_path }}/bin gettor_service start + {{ gettor_path }}/venv/bin/python3 {{ gettor_path }}/bin gettor_service start

1 0

[gettor/master] Update gettor tasks
by hiro＠torproject.org 01 Sep '19

01 Sep '19

commit bc870821f8eeec371b62401a87adb5b14b6be0a1 Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 16:29:29 2019 +0200 Update gettor tasks --- roles/gettor/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index df97000..14a1b50 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -21,8 +21,8 @@ args: chdir: "{{ gettor_path }}" -- name: create virtualenv - command: > +- name: activate virtualenv + shell: > source {{ gettor_path }}/venv/bin/activate args: chdir: "{{ gettor_path }}"

1 0

[gettor/master] Update gettor tasks
by hiro＠torproject.org 01 Sep '19

01 Sep '19

commit 065505be2dadc25172f83fb27a77619df0d4b2e7 Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 16:23:38 2019 +0200 Update gettor tasks --- playbooks/group_vars/all.yml | 2 +- roles/gettor/tasks/main.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/group_vars/all.yml b/playbooks/group_vars/all.yml index 212591b..beb08b7 100644 --- a/playbooks/group_vars/all.yml +++ b/playbooks/group_vars/all.yml @@ -1,3 +1,3 @@ --- gettor_repo: https://git.torproject.org/gettor.git -gettor_path: /srv/gettor.torproject.org/home/gettor/gettor +gettor_path: /srv/gettor.torproject.org/home/gettor diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index 5ba1d67..df97000 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -7,10 +7,10 @@ - name: update gettor source git: repo: https://git.torproject.org/gettor.git - dest: /srv/gettor.torproject.org/home/gettor/gettor + dest: /srv/gettor.torproject.org/home/gettor/ clone: no update: yes - + - name: export stats command: > {{ gettor_path }}/scripts/export_stats

1 0

[gettor/master] Update gettor tasks
by hiro＠torproject.org 01 Sep '19

01 Sep '19

commit 0af63a43dc42746521ee75532e447b9f7ef4f26e Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 16:17:51 2019 +0200 Update gettor tasks --- roles/gettor/tasks/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index 746602a..5ba1d67 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -8,7 +8,9 @@ git: repo: https://git.torproject.org/gettor.git dest: /srv/gettor.torproject.org/home/gettor/gettor - + clone: no + update: yes + - name: export stats command: > {{ gettor_path }}/scripts/export_stats

1 0

[gettor/master] Update gettor tasks
by hiro＠torproject.org 01 Sep '19

01 Sep '19

commit 10a2c1e28920ff43ac64f29ac69fcb9cceac19de Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 16:15:11 2019 +0200 Update gettor tasks --- playbooks/group_vars/all.yml | 2 +- roles/gettor/tasks/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/group_vars/all.yml b/playbooks/group_vars/all.yml index 9ba7505..212591b 100644 --- a/playbooks/group_vars/all.yml +++ b/playbooks/group_vars/all.yml @@ -1,3 +1,3 @@ --- gettor_repo: https://git.torproject.org/gettor.git -gettor_path: /home/gettor/gettor +gettor_path: /srv/gettor.torproject.org/home/gettor/gettor diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index 8c8d61c..746602a 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -7,7 +7,7 @@ - name: update gettor source git: repo: https://git.torproject.org/gettor.git - dest: /home/gettor/gettor + dest: /srv/gettor.torproject.org/home/gettor/gettor - name: export stats command: >

1 0

[gettor/master] Update gettor tasks
by hiro＠torproject.org 01 Sep '19

01 Sep '19

commit 0a829a36b02d2e6ada5cdabb1f447c77a53c64e8 Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 16:13:44 2019 +0200 Update gettor tasks --- roles/gettor/tasks/main.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index 30081c2..8c8d61c 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -19,12 +19,16 @@ args: chdir: "{{ gettor_path }}" +- name: create virtualenv + command: > + source {{ gettor_path }}/venv/bin/activate + args: + chdir: "{{ gettor_path }}" + - name: create database - template: src=venv_exec.j2 dest={{ gettor_path }}/venv/exec mode=755 command: > {{ gettor_path }}/scripts/create_db -n -c -o - - name: add links command: > {{ gettor_path }}/scripts/add_links_to_db -f gettor.db

1 0

[gettor/master] Update gettor tasks
by hiro＠torproject.org 01 Sep '19

01 Sep '19

commit 64e3c9122c57112ef44ab8b4dcdf66cdf5441098 Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 16:11:29 2019 +0200 Update gettor tasks --- roles/gettor/tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index 3a2aa48..30081c2 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -20,9 +20,10 @@ chdir: "{{ gettor_path }}" - name: create database + template: src=venv_exec.j2 dest={{ gettor_path }}/venv/exec mode=755 command: > {{ gettor_path }}/scripts/create_db -n -c -o - template: src=venv_exec.j2 dest={{ gettor_path }}/venv/exec mode=755 + - name: add links command: >

1 0