From 8b113cfbd1068ba63c7021dac03b37aecabe4ffc Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 7 Feb 2020 20:23:19 +0100
Subject: fix blackmagic repo auth

---
 roles/apt-repo/blackmagic/tasks/main.yml | 38 ++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 7 deletions(-)

(limited to 'roles/apt-repo/blackmagic/tasks/main.yml')

diff --git a/roles/apt-repo/blackmagic/tasks/main.yml b/roles/apt-repo/blackmagic/tasks/main.yml
index 7eb99dac..01cf9c99 100644
--- a/roles/apt-repo/blackmagic/tasks/main.yml
+++ b/roles/apt-repo/blackmagic/tasks/main.yml
@@ -10,17 +10,41 @@
     dest: /etc/apt/trusted.gpg.d/blackmagic.gpg
   notify: update apt cache
 
+
 - name: configure repo authentication
-  copy:
-    content: |
-      machine build.spreadspace.org
-      login {{ apt_repo_blackmagic_auth.username }}
-      password {{ apt_repo_blackmagic_auth.password }}
-      dest: /etc/apt/auth.conf.d/blackmagic.conf
-    dest: /etc/apt/auth.conf.d/blackmagic.conf
+  when:
+    - ansible_distribution == "Debian"
+    - (ansible_distribution_major_version | int) < 10
+  lineinfile:
+    path: /etc/apt/auth.conf
+    regexp: "^machine build.spreadspace.org "
+    line: "machine build.spreadspace.org login {{ apt_repo_blackmagic_auth.username }} password {{ apt_repo_blackmagic_auth.password }}"
+    create: yes
     mode: 0600
   notify: update apt cache
 
+- name: configure repo authentication
+  when: (ansible_distribution == "Ubuntu") or
+        (ansible_distribution == "Debian" and (ansible_distribution_major_version | int) >= 10)
+  block:
+    - name: remove old repo authentication
+      lineinfile:
+        path: /etc/apt/auth.conf
+        regexp: "^machine build.spreadspace.org "
+        state: absent
+      notify: update apt cache
+
+    - name: configure repo authentication
+      copy:
+        content: |
+          machine build.spreadspace.org
+          login {{ apt_repo_blackmagic_auth.username }}
+          password {{ apt_repo_blackmagic_auth.password }}
+        dest: /etc/apt/auth.conf.d/blackmagic.conf
+        mode: 0600
+      notify: update apt cache
+
+
 - name: add repository entry
   copy:
     content: |
-- 
cgit v1.2.3