From 18c1c9fb2eef51f0e726a2301284841d700f8e5e Mon Sep 17 00:00:00 2001
From: Jack Ivanov <e601809@gmail.com>
Date: Thu, 6 Aug 2020 21:12:10 +0100
Subject: [PATCH] Install dnscrypt-proxy from ubuntu repos

---
 roles/dns/tasks/ubuntu.yml | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/roles/dns/tasks/ubuntu.yml b/roles/dns/tasks/ubuntu.yml
index dfe172d..3ccbdc1 100644
--- a/roles/dns/tasks/ubuntu.yml
+++ b/roles/dns/tasks/ubuntu.yml
@@ -1,13 +1,23 @@
 ---
-- name: Add the repository
-  apt_repository:
-    state: present
-    codename: "{{ ansible_distribution_release }}"
-    repo: ppa:shevchuk/dnscrypt-proxy
-  register: result
-  until: result is succeeded
-  retries: 10
-  delay: 3
+- block:
+  - name: Add the repository
+    apt_repository:
+      state: present
+      codename: "{{ ansible_distribution_release }}"
+      repo: ppa:shevchuk/dnscrypt-proxy
+    register: result
+    until: result is succeeded
+    retries: 10
+    delay: 3
+
+  - name: Configure unattended-upgrades
+    copy:
+      src: 50-dnscrypt-proxy-unattended-upgrades
+      dest: /etc/apt/apt.conf.d/50-dnscrypt-proxy-unattended-upgrades
+      owner: root
+      group: root
+      mode: 0644
+  when: ansible_facts['distribution_version'] is version('20.04', '<')
 
 - name: Install dnscrypt-proxy
   apt:
@@ -15,14 +25,6 @@
     state: present
     update_cache: true
 
-- name: Configure unattended-upgrades
-  copy:
-    src: 50-dnscrypt-proxy-unattended-upgrades
-    dest: /etc/apt/apt.conf.d/50-dnscrypt-proxy-unattended-upgrades
-    owner: root
-    group: root
-    mode: 0644
-
 - block:
   - name: Ubuntu | Configure AppArmor policy for dnscrypt-proxy
     copy: