From 361293351ef3df71f6003fb9fa6fb399afa7632d Mon Sep 17 00:00:00 2001
From: ClementJ35 <83649562+ClementJ35@users.noreply.github.com>
Date: Mon, 19 Aug 2024 10:40:55 +0200
Subject: [PATCH] Add repository as vars (fix #18) & use builtin task apt_repo
 and yum_repo instead of blob files (#21)

Use variables instead of a file to deploy repositories
---
 roles/install/defaults/main.yml              | 17 +++++++++++++++++
 roles/install/files/debian_lemonldap-ng.list |  3 ---
 roles/install/files/redhat_lemonldap-ng.repo | 13 -------------
 roles/install/tasks/debian.yml               | 12 ++++++------
 roles/install/tasks/redhat.yml               | 14 ++++++++------
 5 files changed, 31 insertions(+), 28 deletions(-)
 delete mode 100644 roles/install/files/debian_lemonldap-ng.list
 delete mode 100644 roles/install/files/redhat_lemonldap-ng.repo

diff --git a/roles/install/defaults/main.yml b/roles/install/defaults/main.yml
index fc14b26..0fb5a6a 100644
--- a/roles/install/defaults/main.yml
+++ b/roles/install/defaults/main.yml
@@ -8,3 +8,20 @@ lemonldap_webserver_conf:
   - manager
   - portal
   - test
+
+lemonldap_apt_repositories:
+  - deb     http://lemonldap-ng.org/deb stable main
+  - deb-src http://lemonldap-ng.org/deb stable main
+
+lemonldap_yum_repositories:
+  - name: LemonLDAP::NG packages
+    baseurl: https://lemonldap-ng.org/redhat/stable/$releasever/noarch/
+    enabled: true
+    gpgcheck: true
+    gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OW2
+
+  - name: LemonLDAP::NG sources
+    baseurl: https://lemonldap-ng.org/redhat/stable/$releasever/SRPMS/
+    enabled: false
+    gpgcheck: true
+    gpgkey: file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OW2
diff --git a/roles/install/files/debian_lemonldap-ng.list b/roles/install/files/debian_lemonldap-ng.list
deleted file mode 100644
index 4bfcee7..0000000
--- a/roles/install/files/debian_lemonldap-ng.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# LemonLDAP::NG repository
-deb     http://lemonldap-ng.org/deb stable main
-deb-src http://lemonldap-ng.org/deb stable main
diff --git a/roles/install/files/redhat_lemonldap-ng.repo b/roles/install/files/redhat_lemonldap-ng.repo
deleted file mode 100644
index dc066f6..0000000
--- a/roles/install/files/redhat_lemonldap-ng.repo
+++ /dev/null
@@ -1,13 +0,0 @@
-[lemonldap-ng]
-name=LemonLDAP::NG packages
-baseurl=https://lemonldap-ng.org/redhat/stable/$releasever/noarch/
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OW2
-
-[lemonldap-ng-sources]
-name=LemonLDAP::NG sources
-baseurl=https://lemonldap-ng.org/redhat/stable/$releasever/SRPMS/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OW2
diff --git a/roles/install/tasks/debian.yml b/roles/install/tasks/debian.yml
index 221f516..64d225f 100644
--- a/roles/install/tasks/debian.yml
+++ b/roles/install/tasks/debian.yml
@@ -17,13 +17,13 @@
     file: /tmp/gpg-key-ow2
     state: present
 
+# Defined in defaults/main.yml
 - name: Install LLNG Debian Repository
-  ansible.builtin.copy:
-    src: debian_lemonldap-ng.list
-    dest: /etc/apt/sources.list.d/lemonldap-ng.list
-    owner: root
-    group: root
-    mode: 0644
+  ansible.builtin.apt_repository:
+    repo: '{{ item }}'
+    state: present
+    filename: lemonldap-ng.list
+  loop: '{{ lemonldap_apt_repositories }}'
   register: llng_repo
 
 - name: Install Webserver and dependencies
diff --git a/roles/install/tasks/redhat.yml b/roles/install/tasks/redhat.yml
index 299d4fc..5627d13 100644
--- a/roles/install/tasks/redhat.yml
+++ b/roles/install/tasks/redhat.yml
@@ -36,13 +36,15 @@
   ansible.builtin.command:
     cmd: dnf -y config-manager --set-enabled {{ powertools_repo }}
 
+# Defined in defaults/main.yml
 - name: Install LLNG Enterprise Linux Repository
-  ansible.builtin.copy:
-    src: redhat_lemonldap-ng.repo
-    dest: /etc/yum.repos.d/lemonldap-ng.repo
-    owner: root
-    group: root
-    mode: 0644
+  ansible.builtin.yum_repository:
+    name: '{{ item.name }}'
+    baseurl: '{{ item.baseurl }}'
+    file: /etc/yum.repos.d/lemonldap-ng.repo
+    gpgcheck: '{{ item.gpgcheck }}'
+    gpgkey: '{{ item.gpgkey }}'
+  loop: '{{ lemonldap_yum_repositories }}'
   register: llng_repo
 
 - name: Install Webserver and dependencies