[tor-commits] [gettor/master] Remove gettor-web role - moving to static www rotation w jenkins

[hiro@xxxxxxxxxxxxxx]

commit 6843ae4203bc094cede1e1ae4addc899582f92cc
Author: hiro <hiro@xxxxxxxxxxxxxx>
Date:   Fri Oct 4 17:03:58 2019 +0200

    Remove gettor-web role - moving to static www rotation w jenkins
---
 playbooks/update-all.yml        |  1 -
 playbooks/update-gettor.yml     |  5 -----
 playbooks/update-web.yml        |  5 -----
 roles/gettor-web/tasks/main.yml | 42 -----------------------------------------
 roles/gettor/tasks/main.yml     | 15 ++-------------
 5 files changed, 2 insertions(+), 66 deletions(-)

diff --git a/playbooks/update-all.yml b/playbooks/update-all.yml
index 1b08808..08534e4 100644
--- a/playbooks/update-all.yml
+++ b/playbooks/update-all.yml
@@ -3,4 +3,3 @@
     - gettor
   roles:
     - gettor
-    - gettor-web
diff --git a/playbooks/update-gettor.yml b/playbooks/update-gettor.yml
deleted file mode 100644
index 08534e4..0000000
--- a/playbooks/update-gettor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts:
-    - gettor
-  roles:
-    - gettor
diff --git a/playbooks/update-web.yml b/playbooks/update-web.yml
deleted file mode 100644
index bec2711..0000000
--- a/playbooks/update-web.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts:
-    - gettor
-  roles:
-    - gettor-web
diff --git a/roles/gettor-web/tasks/main.yml b/roles/gettor-web/tasks/main.yml
deleted file mode 100644
index c1f4aff..0000000
--- a/roles/gettor-web/tasks/main.yml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-- name: check if repository exists
-  stat:
-    path: "{{ gettor_web_path }}/.git/config"
-  register: stat_result
-
-- name: update gettor source
-  git:
-    repo: https://git.torproject.org/project/web/gettor-web.git
-    version: master
-    dest: /srv/gettor.torproject.org/home/gettor-web/
-    clone: no
-    update: yes
-  when: stat_git_result.stat.exists
-
-- name: create virtualenv
-  command: >
-    virtualenv {{ gettor_path }}/venv
-  args:
-    chdir: "{{ gettor_path }}"
-
-- pip:
-    name: lektor
-    virtualenv: "{{ gettor_web_path }}/venv"
-
-- name: activate virtualenv
-  shell: source bin/activate
-  args:
-    chdir: "{{ gettor_web_path }}/venv"
-    executable: /bin/bash
-
-- name: lektor build
-  shell: venv/bin/lektor build -O {{ home_path }}www
-  args:
-    chdir: "{{ gettor_web_path }}"
-    executable: /bin/bash
-
-- name: update static component
-  shell: static-update-component gettor.torproject.org
-  args:
-    chdir: "{{ gettor_web_path }}"
-    executable: /bin/bash
diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml
index 5c3c541..d27ad5f 100644
--- a/roles/gettor/tasks/main.yml
+++ b/roles/gettor/tasks/main.yml
@@ -23,25 +23,14 @@
   args:
     chdir: "{{ gettor_path }}"
 
-- name: create virtualenv
-  shell: virtualenv venv
-  args:
-    chdir: "{{ gettor_path }}"
-
-- name: activate virtualenv
-  shell: source bin/activate
-  args:
-    chdir: "{{ gettor_path }}/venv"
-    executable: /bin/bash
-
 - name: create database
-  shell: venv/bin/python3 scripts/create_db -n -c -o -f gettor.db
+  shell: python3 scripts/create_db -n -c -o -f gettor.db
   args:
     chdir: "{{ gettor_path }}"
     executable: /bin/bash
 
 - name: add links
-  shell: venv/bin/python3 scripts/add_links_to_db -f gettor.db
+  shell: python3 scripts/add_links_to_db -f gettor.db
   args:
     chdir: "{{ gettor_path }}"
     executable: /bin/bash

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits