From 19e9442792b4ed4b009b761c6c49b8135454f1d8 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 28 Sep 2019 00:37:12 +0200
Subject: don't use apt_key and apt_repository module anymore (cont'd)

---
 roles/apt-repo/spreadspace/files/repo.asc    | 110 ---------------------------
 roles/apt-repo/spreadspace/files/repo.gpg    | Bin 0 -> 5035 bytes
 roles/apt-repo/spreadspace/handlers/main.yml |   4 +
 roles/apt-repo/spreadspace/tasks/main.yml    |  19 +++--
 4 files changed, 16 insertions(+), 117 deletions(-)
 delete mode 100644 roles/apt-repo/spreadspace/files/repo.asc
 create mode 100644 roles/apt-repo/spreadspace/files/repo.gpg
 create mode 100644 roles/apt-repo/spreadspace/handlers/main.yml

(limited to 'roles')

diff --git a/roles/apt-repo/spreadspace/files/repo.asc b/roles/apt-repo/spreadspace/files/repo.asc
deleted file mode 100644
index 71ac1871..00000000
--- a/roles/apt-repo/spreadspace/files/repo.asc
+++ /dev/null
@@ -1,110 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-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
-=9IiV
------END PGP PUBLIC KEY BLOCK-----
diff --git a/roles/apt-repo/spreadspace/files/repo.gpg b/roles/apt-repo/spreadspace/files/repo.gpg
new file mode 100644
index 00000000..1ff46fa0
Binary files /dev/null and b/roles/apt-repo/spreadspace/files/repo.gpg differ
diff --git a/roles/apt-repo/spreadspace/handlers/main.yml b/roles/apt-repo/spreadspace/handlers/main.yml
new file mode 100644
index 00000000..03ed878a
--- /dev/null
+++ b/roles/apt-repo/spreadspace/handlers/main.yml
@@ -0,0 +1,4 @@
+---
+- name: update apt cache
+  apt:
+    update_cache: yes
diff --git a/roles/apt-repo/spreadspace/tasks/main.yml b/roles/apt-repo/spreadspace/tasks/main.yml
index 9434ae4d..6c3c163f 100644
--- a/roles/apt-repo/spreadspace/tasks/main.yml
+++ b/roles/apt-repo/spreadspace/tasks/main.yml
@@ -5,12 +5,17 @@
     state: present
 
 - name: add repository key
-  apt_key:
-    data: "{{ lookup('file', 'repo.asc') }}"
-    state: present
+  copy:
+    src: repo.gpg
+    dest: /etc/apt/trusted.gpg.d/spreadspace.gpg
+  notify: update apt cache
 
 - name: add repository entry
-  apt_repository:
-    repo: deb https://build.spreadspace.org/ {{ ansible_distribution_release }} main
-    state: present
-    filename: spreadspace
+  copy:
+    content: |
+      deb https://build.spreadspace.org/ {{ ansible_distribution_release }} main
+    dest: /etc/apt/sources.list.d/spreadspace.list
+  notify: update apt cache
+
+- name: update apt cache
+  meta: flush_handlers
-- 
cgit v1.2.3