From 66a49b666f05b79fe2f7628dd4010aecd0ac8799 Mon Sep 17 00:00:00 2001
From: L3D <l3d@see-base.de>
Date: Sat, 20 Jul 2019 22:38:49 +0200
Subject: [PATCH] Optimize non-free handling

---
 defaults/main.yml |  3 +++
 tasks/sources.yml | 26 +++++++++++++++++++++++++-
 vars/main.yml     |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index c0a3278..ae33ddd 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -16,5 +16,8 @@ editor_is_vim: true
 # print os variables
 print_os_vars: false
 
+# do we want non-free firmware from eth zuerich?
+base_pkg_non_free_firmware: false
+
 # version management
 submodules_versioncheck: true
diff --git a/tasks/sources.yml b/tasks/sources.yml
index 14bffad..3f6b4fa 100644
--- a/tasks/sources.yml
+++ b/tasks/sources.yml
@@ -19,6 +19,7 @@
     repo: deb https://debian.ethz.ch/debian/ {{ ansible_distribution_release }} main
     state: present
   when:
+    - not base_pkg_non_free_firmware | bool
     - add_ethz | bool
     - ansible_distribution == 'Debian'
     - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy'
@@ -26,9 +27,32 @@
 - name: remove eth zurich apt
   become: true
   apt_repository:
-    repo: deb-src https://debian.ethz.ch/debian/ {{ ansible_distribution_release }} main
+    repo: deb https://debian.ethz.ch/debian/ {{ ansible_distribution_release }} main
     state: absent
   when:
+    - not base_pkg_non_free_firmware | bool
+    - not add_ethz | bool
+    - ansible_distribution == 'Debian'
+    - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy'
+
+- name: add eth zurich apt
+  become: true
+  apt_repository:
+    repo: deb-src https://debian.ethz.ch/debian/ {{ ansible_distribution_release }} main non-free
+    state: present
+  when:
+    - base_pkg_non_free_firmware | bool
+    - add_ethz | bool
+    - ansible_distribution == 'Debian'
+    - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy'
+
+- name: remove eth zurich apt
+  become: true
+  apt_repository:
+    repo: deb-src https://debian.ethz.ch/debian/ {{ ansible_distribution_release }} main non-free
+    state: absent
+  when:
+    - base_pkg_non_free_firmware | bool
     - not add_ethz | bool
     - ansible_distribution == 'Debian'
     - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy'
diff --git a/vars/main.yml b/vars/main.yml
index fad6fb8..0e54cb7 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -47,5 +47,5 @@ fedora_packages:
   - python3-pip 
   - python3
 
-playbook_version_number: 8966 # should be over ninethousand
+playbook_version_number: 8968 # should be over ninethousand
 playbook_version_path: '/etc/ansible-version/base-packages_ffbsee_or_chaos-bodensee_github.version'