install v2 by default, documented configuration directives

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2018-2019 redirection.io
+Copyright (c) 2018-2021 redirection.io
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -17,7 +17,12 @@ ansible-galaxy install redirectionio.apache_module
 
 ## Role variables
 
-This role does not provide variables.
+By default, this role installs the last stable version of [libapache2-mod-redirectionio](https://github.com/redirectionio/libapache2-mod-redirectionio).
+This behavior can be modified using the following role variables:
+
+ * `redirectionio_apache_module_channel` (default: `stable`): choose a specific release channel (`stable` or `beta`)
+ * `redirectionio_apache_module_main_version` (default: `2`): main version of the Apache module. This allows to upgrade safely your system without BC break with a new main version
+ * `redirectionio_apache_module_version` (default: `*`): specific version of the Apache module. Use `*` to use the latest available version. Valid versions are of the form: `[timestamp]:[version]-[build]`, if you want a specific version like `2.0.0`, you should use `:2.0.0-`
 
 ## Example playbook
 

defaults/main.yml

@@ -4,11 +4,13 @@ redirectionio_packages_url: https://packages.redirection.io/
 redirectionio_gpg_key_url: "{{ redirectionio_packages_url }}gpg.key"
 
 # Version management
-# This allow to choose a specific version for your infrastructure
-# Channel can be stable or beta, left empty to use legacy system
-redirectionio_apache_module_channel: ""
-# Main version of agent, this allow to upgrade safely your system without BC break with a new main version
+# This allows to choose a specific release channel (stable or beta)
+redirectionio_apache_module_channel: "stable"
+
+# Main version of the Apache module
+# This allows to upgrade safely your system without BC break with a new main version
 redirectionio_apache_module_main_version: 2
-# Specific version for your agent, use * to use the latest available version
-# Version are of the form: [timestamp]:[version]-[build], if you want a specific version like 2.0.0 you should put *:2.0.0-*
+
+# Specific version of the Apache module. Use * to use the latest available version
+# Versions are of the form: [timestamp]:[version]-[build], if you want a specific version like 2.0.0, you should put *:2.0.0-*
 redirectionio_apache_module_version: "*"

meta/main.yml

@@ -10,20 +10,23 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - xenial
-        - artful
         - bionic
         - cuttlefish
+        - disco
+        - eoan
+        - focal
     - name: Debian
       versions:
         - stretch
         - buster
     - name: EL
       versions:
+        - 8
         - 7
-        - 6
   galaxy_tags:
     - apache
     - http
     - monitoring
     - redirection
+    - seo
 dependencies: []

tasks/pkg-debian.yml

@@ -14,13 +14,13 @@
   apt_repository:
     repo: "deb {{ redirectionio_packages_url }}deb {{ ansible_distribution_release }} main"
     state: present
-  when: redirectionio_apache_module_channel|length == 0
+  when: redirectionio_apache_module_main_version == 1
 
 - name: Install redirection.io repository
   apt_repository:
     repo: "deb {{ redirectionio_packages_url }}deb/{{ redirectionio_apache_module_channel }}/{{ redirectionio_apache_module_main_version }} {{ ansible_distribution_release }} main"
     state: present
-  when: redirectionio_apache_module_channel|length > 0
+  when: redirectionio_apache_module_main_version > 1
 
 - name: Update apt cache
   apt:

tasks/pkg-redhat.yml

@@ -5,35 +5,25 @@
     state: present
     key: "{{ redirectionio_gpg_key_url }}"
 
-- name: Define distribution_repository_name
-  set_fact:
-    distribution_repository_name: centos
-  when: ansible_distribution != 'Fedora'
-
-- name: Define distribution_repository_name when the distribution is Fedora
-  set_fact:
-    distribution_repository_name: fedora
-  when: ansible_distribution == 'Fedora'
-
 - name: Install redirection.io repository
   yum_repository:
     name: redirectionio
     description: redirection.io
-    baseurl: "{{ redirectionio_packages_url }}rpm/{{ distribution_repository_name }}_{{ ansible_distribution_major_version }}"
+    baseurl: "{{ redirectionio_packages_url }}rpm/centos_{{ ansible_distribution_major_version }}"
     enabled: yes
     gpgcheck: yes
     state: present
-  when: redirectionio_apache_module_channel|length == 0
+  when: redirectionio_apache_module_main_version == 1
 
 - name: Install redirection.io repository
   yum_repository:
     name: redirectionio
     description: redirection.io
-    baseurl: "{{ redirectionio_packages_url }}rpm/{{ redirectionio_apache_module_channel }}/{{ redirectionio_apache_module_main_version }}/{{ distribution_repository_name }}_{{ ansible_distribution_major_version }}"
+    baseurl: "{{ redirectionio_packages_url }}rpm/{{ redirectionio_apache_module_channel }}/{{ redirectionio_apache_module_main_version }}/centos_{{ ansible_distribution_major_version }}"
     enabled: yes
     gpgcheck: yes
     state: present
-  when: redirectionio_apache_module_channel|length > 0
+  when: redirectionio_apache_module_main_version > 1
 
 - name: Update yum cache
   yum: