From 688c1d0ca23e8066abe17b68f18b0bfe7bf013d4 Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Mon, 8 Jul 2019 21:52:06 +0200
Subject: [PATCH] Add contrib and non free by default

---
 monitoring.yml                                         |  4 ----
 roles/debian-apt-sources/templates/apt/sources.list.j2 | 10 +++-------
 roles/debian-non-free/tasks/main.yml                   |  5 -----
 3 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 roles/debian-non-free/tasks/main.yml

diff --git a/monitoring.yml b/monitoring.yml
index 7918cef2..9f6cc8dd 100644
--- a/monitoring.yml
+++ b/monitoring.yml
@@ -10,11 +10,7 @@
         targets: ['localhost:9090']
     prometheus_ups_snmp_targets:
       - targets: [pulsar.adm.crans.org]
-
-    # Debian non-free mirror
-    debian_mirror: http://mirror.adm.crans.org/debian
   roles:
-    - debian-non-free
     - prometheus
     - prometheus-alertmanager
 
diff --git a/roles/debian-apt-sources/templates/apt/sources.list.j2 b/roles/debian-apt-sources/templates/apt/sources.list.j2
index ad448e64..e3eb66e4 100644
--- a/roles/debian-apt-sources/templates/apt/sources.list.j2
+++ b/roles/debian-apt-sources/templates/apt/sources.list.j2
@@ -1,14 +1,10 @@
 # {{ ansible_managed }}
 
 # Mises à jour de sécurité
-deb     {{ debian_mirror }}-security {{ ansible_lsb.codename }}/updates main
-deb-src {{ debian_mirror }}-security {{ ansible_lsb.codename }}/updates main
+deb     {{ debian_mirror }}-security {{ ansible_lsb.codename }}/updates main contrib non-free
 
 # Dépôt classique
-deb     {{ debian_mirror }} {{ ansible_lsb.codename }} main
-deb-src {{ debian_mirror }} {{ ansible_lsb.codename }} main
+deb     {{ debian_mirror }} {{ ansible_lsb.codename }} main contrib non-free
 
 # Dépôt pour mises à jour fréquentes (volatile)
-deb     {{ debian_mirror }} {{ ansible_lsb.codename }}-updates main
-deb-src {{ debian_mirror }} {{ ansible_lsb.codename }}-updates main
-
+deb     {{ debian_mirror }} {{ ansible_lsb.codename }}-updates main contrib non-free
diff --git a/roles/debian-non-free/tasks/main.yml b/roles/debian-non-free/tasks/main.yml
deleted file mode 100644
index 1cea2678..00000000
--- a/roles/debian-non-free/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- name: Add Debian non-free repository
-  apt_repository:
-    repo: deb {{ debian_mirror }} {{ ansible_lsb.codename }} non-free
-    state: present
-- 
GitLab