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

@@ -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

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

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