From 5cb6805b36449014773916f276aff7d4eef7d214 Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Mon, 8 Jul 2019 22:22:35 +0200
Subject: [PATCH] Remove contrib and non free from VMs

---
 base.yml                                               | 3 +++
 roles/debian-apt-sources/templates/apt/sources.list.j2 | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/base.yml b/base.yml
index df62e113..d9d47d1c 100644
--- a/base.yml
+++ b/base.yml
@@ -4,6 +4,9 @@
   vars:
     # Debian mirror on adm
     debian_mirror: http://mirror.adm.crans.org/debian
+    debian_components: |
+      main{% if ansible_system_vendor != 'QEMU' %} non-free{% endif %}
+    # TODO: non free should only be for SMTP and microcode on non VM/LXC
 
     # Backup password
     backuppc_rsyncd_passwd: "{{ vault_backuppc_rsyncd_passwd }}"
diff --git a/roles/debian-apt-sources/templates/apt/sources.list.j2 b/roles/debian-apt-sources/templates/apt/sources.list.j2
index e3eb66e4..361a5d1d 100644
--- a/roles/debian-apt-sources/templates/apt/sources.list.j2
+++ b/roles/debian-apt-sources/templates/apt/sources.list.j2
@@ -1,10 +1,10 @@
 # {{ ansible_managed }}
 
 # Mises à jour de sécurité
-deb     {{ debian_mirror }}-security {{ ansible_lsb.codename }}/updates main contrib non-free
+deb     {{ debian_mirror }}-security {{ ansible_lsb.codename }}/updates {{ debian_components }}
 
 # Dépôt classique
-deb     {{ debian_mirror }} {{ ansible_lsb.codename }} main contrib non-free
+deb     {{ debian_mirror }} {{ ansible_lsb.codename }} {{ debian_components }}
 
 # Dépôt pour mises à jour fréquentes (volatile)
-deb     {{ debian_mirror }} {{ ansible_lsb.codename }}-updates main contrib non-free
+deb     {{ debian_mirror }} {{ ansible_lsb.codename }}-updates {{ debian_components }}
-- 
GitLab