From bbace95c25f2d22163b04d8d3ebd535c7eddfc60 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Tue, 15 Aug 2023 21:44:16 +0200
Subject: factor out apt repository setup to apt_repo

---
 roles/apt_ppa/tasks/main.yml | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

(limited to 'roles/apt_ppa/tasks')

diff --git a/roles/apt_ppa/tasks/main.yml b/roles/apt_ppa/tasks/main.yml
index e6f3f04..01d6809 100644
--- a/roles/apt_ppa/tasks/main.yml
+++ b/roles/apt_ppa/tasks/main.yml
@@ -1,19 +1,8 @@
-- name: Set up repository
-  become: true
-  block:
-    - name: Create keys directory
-      ansible.builtin.file:
-        path: '{{ ppa_keys_dir }}'
-        mode: '755'
-        state: directory
-
-    - name: 'Add key: {{ ppa_name }}'
-      ansible.builtin.get_url:
-        url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x{{ ppa_key }}'
-        dest: '{{ ppa_keys_dir }}/{{ ppa_name }}.asc'
-        mode: '644'
-
-    - name: 'Add repository: {{ ppa_name }}'
-      ansible.builtin.apt_repository:
-        repo: 'deb [signed-by={{ ppa_keys_dir }}/{{ ppa_name }}.asc] https://ppa.launchpadcontent.net/{{ ppa_owner }}/{{ ppa_name }}/ubuntu {{ ppa_distro }} main'
-        filename: '{{ ppa_name }}'
+- name: Set up PPA repository
+  ansible.builtin.include_role:
+    name: apt_repo
+  vars:
+    apt_repo_name: '{{ ppa_name }}'
+    apt_repo_key_url: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x{{ ppa_key }}'
+    apt_repo_url: 'https://ppa.launchpadcontent.net/{{ ppa_owner }}/{{ ppa_name }}/ubuntu'
+    apt_repo_distro: '{{ ppa_distro }}'
-- 
cgit v1.2.3