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

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

31 Aug '19

commit 0efd22b14f70cdf8cfe09cfbcf825f6ef2245736 Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 15:38:18 2019 +0200 Update gettor tasks --- roles/gettor/tasks/main.yml | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index 89c53ef..9305f10 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -11,32 +11,29 @@ - name: export stats command: > - {{ gettor_path }}/scripts/export_stats - -- name: virtualenv start - command: > - virtualenv {{ gettor_path }}/venv - environment: - PATH: "{{ gettor_path }}" - -- name: virtualenv activate - command: > - source {{ gettor_path }}/venv/bin/activate - environment: - PATH: "{{ gettor_path }}" + ./scripts/export_stats + chdir: {{ gettor_path }} - name: create database command: > {{ gettor_path }}/scripts/create_db -n -c -o + virtualenv: {{ gettor_path }}/venv + virtualenv_command: virtualenv - name: add links command: > {{ gettor_path }}/scripts/add_links_to_db -f gettor.db + virtualenv: {{ gettor_path }}/venv + virtualenv_command: virtualenv - name: stop gettor command: > {{ gettor_path }}/bin gettor_service stop + virtualenv: {{ gettor_path }}/venv + virtualenv_command: virtualenv - name: start gettor command: > {{ gettor_path }}/bin gettor_service start + virtualenv: {{ gettor_path }}/venv + virtualenv_command: virtualenv

1 0

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

31 Aug '19

commit 9d32489c5af0675952a89aaa12f286f8755078fd Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 15:32:02 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 4db55da..89c53ef 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -15,13 +15,13 @@ - name: virtualenv start command: > - virtualenv venv + virtualenv {{ gettor_path }}/venv environment: PATH: "{{ gettor_path }}" - name: virtualenv activate command: > - source venv/bin/activate + source {{ gettor_path }}/venv/bin/activate environment: PATH: "{{ gettor_path }}"

1 0

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

31 Aug '19

commit bf9e1f52ba60c89ca19e56d4d74fe481b3f1d791 Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 15:25:24 2019 +0200 Update script add_links_to_db --- scripts/add_links_to_db | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/add_links_to_db b/scripts/add_links_to_db index 718f551..4017c01 100755 --- a/scripts/add_links_to_db +++ b/scripts/add_links_to_db @@ -61,7 +61,7 @@ def main(): webFile = request.urlopen(TOR_BROWSER_DOWNLOADS) content = webFile.read() - jsonObj = json.loads(content.json()) + jsonObj = json.loads(content.decode('utf-8')) version = jsonObj.get("version", None) if version is None: print("Could not fetch version from {}.".format(TOR_BROWSER_DOWNLOADS))

1 0

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

31 Aug '19

commit 90e9073167f1832b9045a1adeadb1082f0980076 Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 15:24:09 2019 +0200 Update gettor tasks --- roles/gettor/tasks/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index 2b14a5c..4db55da 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -8,8 +8,6 @@ git: repo: https://git.torproject.org/gettor.git dest: /home/gettor/gettor - umask: '022' - diff: false - name: export stats command: >

1 0

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

31 Aug '19

commit 97e3e0d2c295701fe368bcb75938e1a1db64b4d2 Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 15:23:36 2019 +0200 Update gettor tasks --- roles/gettor/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index 7fa2b6f..2b14a5c 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: {{ gettor_path }} + dest: /home/gettor/gettor umask: '022' diff: false

1 0

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

31 Aug '19

commit 54b525b999e93f1ea3daeeb8ddd3203b7964306a Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 15:22:57 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 4f21d89..7fa2b6f 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -6,8 +6,8 @@ - name: update gettor source git: - repo: {{ gettor_repo }} - dest: "{{ gettor_path }}" + repo: https://git.torproject.org/gettor.git + dest: {{ gettor_path }} umask: '022' diff: false

1 0

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

31 Aug '19

commit 01af4b0c62f80b06f387a02471dd3b574426c1f5 Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 15:21:38 2019 +0200 Update gettor tasks --- roles/gettor/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index 1eb1b76..4f21d89 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -6,7 +6,7 @@ - name: update gettor source git: - repo: "{{ gettor_repo }}" + repo: {{ gettor_repo }} dest: "{{ gettor_path }}" umask: '022' diff: false

1 0

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

31 Aug '19

commit f8956dce91ebc560261d32073e644d81ee0cf6db Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 15:21:06 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 a345e3a..1eb1b76 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -6,8 +6,8 @@ - name: update gettor source git: - repo: {{ gettor_repo }} - dest: {{ gettor_path }} + repo: "{{ gettor_repo }}" + dest: "{{ gettor_path }}" umask: '022' diff: false

1 0

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

31 Aug '19

commit ba072761f5fb1b0e79081fb7a7ea3e3f956b0b38 Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 15:20:09 2019 +0200 Update gettor roles w virtualenv --- roles/gettor/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index f082c72..a345e3a 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: check if repository exists stat: - path: {{ gettor_path }}/.git/config + path: "{{ gettor_path }}/.git/config" register: stat_result - name: update gettor source

1 0

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

31 Aug '19

commit 326175d0fc353bd90d4cb52df2f03ebe500be0ae Author: hiro <hiro(a)torproject.org> Date: Sat Aug 31 15:17:16 2019 +0200 Update script add_links_to_db --- scripts/add_links_to_db | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/add_links_to_db b/scripts/add_links_to_db index 896e2c1..718f551 100755 --- a/scripts/add_links_to_db +++ b/scripts/add_links_to_db @@ -61,7 +61,7 @@ def main(): webFile = request.urlopen(TOR_BROWSER_DOWNLOADS) content = webFile.read() - jsonObj = json.loads(content) + jsonObj = json.loads(content.json()) version = jsonObj.get("version", None) if version is None: print("Could not fetch version from {}.".format(TOR_BROWSER_DOWNLOADS))

1 0