From ceb1ef4c350edd6b41e2fa0fd612c65e3cc3f3d5 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 3 May 2020 01:52:13 +0200
Subject: add tor project repo and some new packages for ch-equinox-ws

---
 chaos-at-home/ch-equinox-ws.yml              |   1 +
 inventory/host_vars/ch-equinox-ws.yml        |  10 +++++++---
 roles/apt-repo/tor-project/files/repo.gpg    | Bin 0 -> 2115 bytes
 roles/apt-repo/tor-project/handlers/main.yml |   4 ++++
 roles/apt-repo/tor-project/tasks/main.yml    |  21 +++++++++++++++++++++
 roles/ubuntu-ws/tasks/main.yml               |   1 +
 6 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 roles/apt-repo/tor-project/files/repo.gpg
 create mode 100644 roles/apt-repo/tor-project/handlers/main.yml
 create mode 100644 roles/apt-repo/tor-project/tasks/main.yml

diff --git a/chaos-at-home/ch-equinox-ws.yml b/chaos-at-home/ch-equinox-ws.yml
index d78d571c..d4701577 100644
--- a/chaos-at-home/ch-equinox-ws.yml
+++ b/chaos-at-home/ch-equinox-ws.yml
@@ -7,4 +7,5 @@
   - role: zsh
   - role: admin-user
   - role: apt-repo/spreadspace
+  - role: apt-repo/tor-project
   - role: ubuntu-ws
diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml
index f7d3e5cc..b1a442b0 100644
--- a/inventory/host_vars/ch-equinox-ws.yml
+++ b/inventory/host_vars/ch-equinox-ws.yml
@@ -74,7 +74,6 @@ ubuntu_ws_extra_packages:
   - git-lfs
   - git-remote-gcrypt
   - gitk
-  - go # needs apt-rep/spreadspace
   - gpredict
   - gputils
   - gstreamer1.0-vaapi
@@ -108,6 +107,7 @@ ubuntu_ws_extra_packages:
   - pitivi
   - playonlinux
   - pm-utils
+  - ppa-purge
   - pristine-tar
   - privoxy
   - pv
@@ -149,12 +149,16 @@ ubuntu_ws_extra_packages:
   - xul-ext-lightning
   - yamllint
   - yasm
+  # needs apt-rep/spreadspace
+  - go
+  # needs apt-rep/tor-project
+  - tor
+  - tor-geoipdb
 
-## needs PPA??
+## needs PPA or other external repo ??
   # - ansible
   # - bazel
   # - deadbeef
-  # - deb.torproject.org-keyring
   # - google-chrome-stable
   # - kubectl
   # - opera-stable
diff --git a/roles/apt-repo/tor-project/files/repo.gpg b/roles/apt-repo/tor-project/files/repo.gpg
new file mode 100644
index 00000000..cdea9587
Binary files /dev/null and b/roles/apt-repo/tor-project/files/repo.gpg differ
diff --git a/roles/apt-repo/tor-project/handlers/main.yml b/roles/apt-repo/tor-project/handlers/main.yml
new file mode 100644
index 00000000..03ed878a
--- /dev/null
+++ b/roles/apt-repo/tor-project/handlers/main.yml
@@ -0,0 +1,4 @@
+---
+- name: update apt cache
+  apt:
+    update_cache: yes
diff --git a/roles/apt-repo/tor-project/tasks/main.yml b/roles/apt-repo/tor-project/tasks/main.yml
new file mode 100644
index 00000000..eef39c19
--- /dev/null
+++ b/roles/apt-repo/tor-project/tasks/main.yml
@@ -0,0 +1,21 @@
+---
+- name: install apt https transport
+  apt:
+    name: apt-transport-https
+    state: present
+
+- name: add repository key
+  copy:
+    src: repo.gpg
+    dest: /etc/apt/trusted.gpg.d/tor-project.gpg
+  notify: update apt cache
+
+- name: add repository entry
+  copy:
+    content: |
+      deb [arch=amd64] http://deb.torproject.org/torproject.org {{ ansible_distribution_release }} main
+    dest: /etc/apt/sources.list.d/tor-poject.list
+  notify: update apt cache
+
+- name: update apt cache
+  meta: flush_handlers
diff --git a/roles/ubuntu-ws/tasks/main.yml b/roles/ubuntu-ws/tasks/main.yml
index 807805f3..6fceef7f 100644
--- a/roles/ubuntu-ws/tasks/main.yml
+++ b/roles/ubuntu-ws/tasks/main.yml
@@ -57,6 +57,7 @@
 - name: remove superflous packages
   apt:
     name:
+    - gnome-keyring
     - gnome-software
     - gnome-software-common
     - software-properties-gtk
-- 
cgit v1.2.3