commit a838ab9edd412a59736704037d064371652c9f10 Author: hiro hiro@torproject.org Date: Sat Aug 31 14:37:23 2019 +0200

Update files for syntax --- roles/gettor/tasks/db.yml | 13 ------------ roles/gettor/tasks/main.yml | 47 ++++++++++++++++++++++++++++++++++++------ roles/gettor/tasks/restart.yml | 21 ------------------- roles/gettor/tasks/source.yml | 12 ----------- 4 files changed, 41 insertions(+), 52 deletions(-)

diff --git a/roles/gettor/tasks/db.yml b/roles/gettor/tasks/db.yml deleted file mode 100644 index 9a16a51..0000000 --- a/roles/gettor/tasks/db.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- - -- name: export stats - command: > - {{ gettor_path }}/scripts/export_stats - -- name: create database - command: > - {{ gettor_path }}/scripts/create_db -n -c -o - -- name: add links - command: > - {{ gettor_path }}/scripts/add_links_to_db -f gettor.db diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index 026443f..37a21ff 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -1,11 +1,46 @@ --- - hosts: gettor tasks: - - name: Update repository - import_tasks: source.yml + - name: check if repository exists + stat: + path: "{{ gettor_path }}/.git/config" + register: stat_result

- - name: Prepare db - import_tasks: db.yml + - name: update gettor source + git: + repo: "{{ gettor_repo }}" + dest: "{{ gettor_path }}" + umask: '022' + diff: false

- - name: Restart - import_tasks: restart.yml + - name: export stats + command: > + {{ gettor_path }}/scripts/export_stats + + - name: create database + command: > + {{ gettor_path }}/scripts/create_db -n -c -o + + - name: add links + command: > + {{ gettor_path }}/scripts/add_links_to_db -f gettor.db + + - 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/restart.yml b/roles/gettor/tasks/restart.yml deleted file mode 100644 index 02b61ae..0000000 --- a/roles/gettor/tasks/restart.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- 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 deleted file mode 100644 index 8fde7d2..0000000 --- a/roles/gettor/tasks/source.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: check if repository exists - stat: - path: "{{ gettor_path }}/.git/config" - register: stat_result - -- name: update gettor source - git: - repo: "{{ gettor_repo }}" - dest: "{{ gettor_path }}" - umask: '022' - diff: false