From ab1e1ca2b4dc7bdf09601c937e3a92d4b131351a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gardais=20J=C3=A9r=C3=A9my?=
 <jeremy.gardais@univ-rennes1.fr>
Date: Wed, 7 Oct 2020 07:18:47 +0200
Subject: [PATCH] Moved back agent_package_url definition in default

---
 CHANGELOG.md      |  8 ++++++++
 defaults/main.yml | 14 +++++++++++++-
 vars/Debian.yml   | 16 ++--------------
 vars/RedHat.yml   | 15 +--------------
 4 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c97ee72..6f272cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## v1.1.1
+
+### Fix
+
+* Moved back fusioninventory__agent_package_url definition in default configuration
+even if it's Debian related to allow installation of a newer version than one
+available in repos or installation from private repository (for Stretch).
+
 ## v1.1.0
 
 ### Features
diff --git a/defaults/main.yml b/defaults/main.yml
index f36f792..1cbe9be 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -13,7 +13,19 @@
 #
 fusioninventory__agent_version: '2.4-2'
                                                                    # ]]]
-
+# .. envvar:: fusioninventory__agent_package_url [[[
+#
+# The URL used to download deb package for fusioninventory-agent.
+#
+# See the official documentation for more informations :
+# http://fusioninventory.org/documentation/agent/installation/linux/deb.html
+#
+# Only works with Debian
+fusioninventory__agent_package_url: '{{ "http://debian.fusioninventory.org/downloads/fusioninventory-agent_"+ fusioninventory__agent_version + "_all.deb"
+                                          if (ansible_distribution_release in
+                                              ([ "stretch" ]))
+                                          else "" }}'
+                                                                   # ]]]
 # .. envvar:: fusioninventory__agent_deploy_state [[[
 #
 # What is the desired state which this role should achieve ? Possible options :
diff --git a/vars/Debian.yml b/vars/Debian.yml
index 831eebd..3cc069e 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -1,7 +1,7 @@
 ---
 # .. vim: foldmarker=[[[,]]]:foldmethod=marker
 
-# .. envvar:: fusioninventory__agent_depend_packages [[[
+# .. envvar:: fusioninventory__agent_depend_packages
 #
 # List of dependent packages to install.
 fusioninventory__agent_depend_packages:
@@ -24,18 +24,6 @@ fusioninventory__agent_depend_packages:
   - 'libtext-template-perl'
   - 'lsb-base'
   - 'xz-utils'
-                                                                       # ]]]
-# .. envvar:: fusioninventory__agent_package_url [[[
-#
-# The URL used to download deb package for fusioninventory-agent.
-#
-# See the official documentation for more informations :
-# http://fusioninventory.org/documentation/agent/installation/linux/deb.html
-#
-fusioninventory__agent_package_url: '{{ "http://debian.fusioninventory.org/downloads/fusioninventory-agent_"+ fusioninventory__agent_version + "_all.deb"
-                                          if (ansible_distribution_release in
-                                              ([ "stretch" ]))
-                                          else "" }}'
-                                                                   # ]]]
+
 fusioninventory__agent_packages:
   - 'fusioninventory-agent'
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index b0ead44..f192008 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -1,24 +1,11 @@
 ---
 # .. vim: foldmarker=[[[,]]]:foldmethod=marker
 
-# .. envvar:: fusioninventory__agent_depend_packages [[[
+# .. envvar:: fusioninventory__agent_depend_packages
 #
 # List of dependent packages to install.
 fusioninventory__agent_depend_packages:
   - 'dmidecode'
-                                                                       # ]]]
-# .. envvar:: fusioninventory__agent_package_url [[[
-#
-# The URL used to download deb package for fusioninventory-agent.
-#
-# See the official documentation for more informations :
-# http://fusioninventory.org/documentation/agent/installation/linux/deb.html
-#
-fusioninventory__agent_package_url: '{{ "http://debian.fusioninventory.org/downloads/fusioninventory-agent_"+ fusioninventory__agent_version + "_all.deb"
-                                          if (ansible_distribution_release in
-                                              ([ "stretch" ]))
-                                          else "" }}'
-                                                                   # ]]]
 
 fusioninventory__agent_packages:
   - 'fusioninventory-agent'