From 525a849400132c94b472f78017976ea0e9639ee7 Mon Sep 17 00:00:00 2001
From: Xavier Lacot <xavier@lacot.org>
Date: Thu, 14 Jan 2021 19:14:33 +0100
Subject: [PATCH] install v2 by default, documented the proxies directive

---
 LICENSE              |  2 +-
 README.md            |  1 +
 defaults/main.yml    | 12 ++++++------
 meta/main.yml        | 12 +++++-------
 tasks/pkg-debian.yml |  4 ++--
 tasks/pkg-redhat.yml |  4 ++--
 6 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/LICENSE b/LICENSE
index 2f81bca..2d32b23 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2018 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
diff --git a/README.md b/README.md
index 3edd0f2..2d6003e 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ You may also configure:
  * `redirectionio_agent_datadir` (default `/var/lib/redirectionio`): where to store persisted rules
  * `redirectionio_agent_cache` (default: `true`): use in-memory cache to speed-up agent matching
  * `redirectionio_agent_log` (default: `{}`): log configuration directives - see the [configuration template](./templates/agent.yml.j2) for more details.
+ * `redirectionio_agent_proxies` (default: `{}`) - see the [configuration reference](https://redirection.io/documentation/developer-documentation/agent-configuration-reference#proxies) for more details.
 
 ## Example playbook
 
diff --git a/defaults/main.yml b/defaults/main.yml
index d2eb133..d5a10a8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -23,15 +23,15 @@ redirectionio_agent_datadir: /var/lib/redirectionio
 redirectionio_agent_cache: 10000
 
 # 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_agent_channel: ""
+# This allows to choose a specific release channel (stable or beta)
+redirectionio_agent_channel: "stable"
 
-# Main version of agent, this allow to upgrade safely your system without BC break with a new main version
+# Main version of the agent
+# This allows to upgrade safely your system without BC break with a new main version
 redirectionio_agent_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 agent. 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_agent_version: "*"
 
 # Logging configuration options
diff --git a/meta/main.yml b/meta/main.yml
index c46cc22..c4a8aa6 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -3,28 +3,26 @@ galaxy_info:
   role_name: 'agent'
   author: 'redirection.io'
   company: "redirection.io"
-  description: Install redirectionio-agent, a versatile http redirection agent designed to help your SEO
+  description: Install redirectionio-agent, a versatile http redirection agent and proxy designed to help your SEO
   license: MIT
   min_ansible_version: 1.6
   platforms:
     - name: Ubuntu
       versions:
-        - trusty
         - xenial
-        - artful
         - bionic
         - cuttlefish
+        - disco
+        - eoan
+        - focal
     - name: Debian
       versions:
-        - wheezy
-        - jessie
         - stretch
         - buster
     - name: EL
       versions:
         - 7
-        - 6
-        - 5
+        - 8
   galaxy_tags:
     - http
     - monitoring
diff --git a/tasks/pkg-debian.yml b/tasks/pkg-debian.yml
index 1842cd2..ad3b253 100644
--- a/tasks/pkg-debian.yml
+++ b/tasks/pkg-debian.yml
@@ -15,13 +15,13 @@
   apt_repository:
     repo: "deb https://packages.redirection.io/deb any main"
     state: present
-  when: redirectionio_agent_channel|length == 0
+  when: redirectionio_agent_main_version == 1
 
 - name: Install redirection.io repository
   apt_repository:
     repo: "deb https://packages.redirection.io/deb/{{ redirectionio_agent_channel }}/{{ redirectionio_agent_main_version }} any main"
     state: present
-  when: redirectionio_agent_channel|length > 0
+  when: redirectionio_agent_main_version > 1
 
 - name: Update apt cache
   apt:
diff --git a/tasks/pkg-redhat.yml b/tasks/pkg-redhat.yml
index 4332bd3..26911ec 100644
--- a/tasks/pkg-redhat.yml
+++ b/tasks/pkg-redhat.yml
@@ -13,7 +13,7 @@
     enabled: yes
     gpgcheck: yes
     state: present
-  when: redirectionio_agent_channel|length == 0
+  when: redirectionio_agent_main_version == 1
 
 - name: Install redirection.io repository
   yum_repository:
@@ -23,7 +23,7 @@
     enabled: yes
     gpgcheck: yes
     state: present
-  when: redirectionio_agent_channel|length > 0
+  when: redirectionio_agent_main_version > 1
 
 - name: Update yum cache
   yum: