From fa7288bc7be50430c3381a89b8506c32e3e342dd Mon Sep 17 00:00:00 2001
From: uumas <gitcommit@uumas.fi>
Date: Mon, 4 Sep 2023 00:51:35 +0300
Subject: [PATCH] caddy: use apt_repository role

---
 roles/caddy/tasks/main.yml | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/roles/caddy/tasks/main.yml b/roles/caddy/tasks/main.yml
index c8a5151..01926f3 100644
--- a/roles/caddy/tasks/main.yml
+++ b/roles/caddy/tasks/main.yml
@@ -1,22 +1,15 @@
 ---
 
-- name: Install dependencies
-  apt:
-    name:
-      - debian-keyring
-      - debian-archive-keyring
-      - apt-transport-https
-    update_cache: true
-
-- name: Add caddy repo signing key
-  apt_key:
-    id: '65760C51EDEA2017CEA2CA15155B6D79CA56EA34'
-    url: 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key'
-- name: Add caddy repo
-  apt_repository:
-    repo: "deb https://dl.cloudsmith.io/public/caddy/stable/deb/debian any-version main"
-    filename: 'caddy-stable'
-    mode: '644'
+- name: Add caddy apt repository
+  ansible.builtin.import_role:
+    name: apt_repository
+  vars:
+    repo_name: caddy-stable
+    repo_url: https://dl.cloudsmith.io/public/caddy/stable/deb/debian
+    repo_key_url: https://dl.cloudsmith.io/public/caddy/stable/gpg.key
+    repo_suite: any-version
+    repo_components:
+      - main
 
 - name: Install caddy
   apt: