[tor-commits] [gettor/master] Update gettor tasks

[hiro at torproject.org]

commit 0efd22b14f70cdf8cfe09cfbcf825f6ef2245736
Author: hiro <hiro at 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