From 6786f57f88c83f9b81af45d807ef65ba9fabe1c4 Mon Sep 17 00:00:00 2001
From: Lilian Roller <lilian.roller@wingcon.com>
Date: Tue, 12 Nov 2019 17:31:27 +0100
Subject: [PATCH] Update sponsor and if condition syntax

---
 .github/FUNDING.yml | 2 +-
 tasks/main.yml      | 4 +---
 vars/main.yml       | 7 ++++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 35aa6ec..1a95489 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,5 +1,5 @@
 # These are supported funding model platforms
 
-# github: [do1jlr]
+github: [do1jlr]
 liberapay: L3D
 custom: https://paypal.me/c3woc
diff --git a/tasks/main.yml b/tasks/main.yml
index 6b9fa9a..b218b71 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -15,9 +15,7 @@
     state: present
     update_cache: yes
     cache_valid_time: 43200
-  when:
-    - ansible_os_family == 'Debian'
-    - ansible_machine != 'armv6l' and ansible_distribution_release != 'wheezy'
+  when: ansible_os_family == 'Debian' and ansible_distribution_version != '7' and ansible_distribution_release != 'wheezy' and ansible_machine != 'armv6l'
 
 - name: Install common base packages [all]
   become: yes
diff --git a/vars/main.yml b/vars/main.yml
index f902eed..b068c0c 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -19,13 +19,14 @@ debian_packages:
   - molly-guard
   - mtr-tiny
   - knot-dnsutils
-  - python-apt
-  - python3-apt
   - fio
   - apt-dater-host
   - apt-transport-https
   - aptitude
   - python3-setuptools
+#non_legacy_debian_packages:
+  - python-apt
+  - python3-apt
 
 packages_for_all_except_rhel:
   - ranger
@@ -50,5 +51,5 @@ fedora_packages:
   - python3-pip 
   - python3
 
-playbook_version_number: 8971 # should be over ninethousand
+playbook_version_number: 8972 # should be over ninethousand
 playbook_version_path: '/etc/ansible-version/base-packages_ffbsee_or_chaos-bodensee_github.version'