From 65e94eaebb9b1234c42a814cbb5cfa9713f1cd9e Mon Sep 17 00:00:00 2001
From: Robert Wimmer <2039811+githubixx@users.noreply.github.com>
Date: Sun, 11 Oct 2020 23:05:12 +0200
Subject: [PATCH] Fix Ubuntu 18 install (#85)

* CHANGELOG formatting

* No need to use PPA for Ubuntu 18 any longer

* update CHANGELOG

* Bring back task to install support packages for Ubuntu < 19.10 just to be sure
---
 CHANGELOG.md           | 14 +++++---------
 tasks/setup-ubuntu.yml | 40 ++++++++++++++--------------------------
 2 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c6acb8..0d61452 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
 Changelog
 ---------
 
+**7.5.0**
+
+- `wireguard` package is now available for Ubuntu 18.04 in universe repository. Before that `ppa:wireguard/wireguard` was used but that one isn't available anymore. The install procedure for Ubuntu 18.04 and 20.04 is now the same as both can use `wireguard` metapackage now. The role takes care to remove `wireguard-dkms` package in favour of `wireguard` metapackage but it leaves the configuration file for `ppa:wireguard/wireguard` repository untouched. So it's up to you to remove that PPA. Either use `apt-add-repository --remove ppa:wireguard/wireguard` or remove the file manually at `/etc/apt/sources.list.d/` directory (you man need to run `apt-get update` afterwards).
+
 **7.4.0**
 
 - Added initial molecule infrastructure
@@ -19,15 +23,7 @@ Changelog
 
 - Fix spelling and typos in docs. (contribution by @ypid)
 - Drop Debian Stretch from the list of tested distros. Actual support was dropped/broken in 6.0.4 without updating the docs. (contribution by @ypid)
-- Remove obsolete `.reload-module-on-update` file.
-
-  It does not serve any function anymore after support for module
-  reloading has been removed from the postinst script in 0.0.20200215-2 on
-  2020-02-24. A module update is properly signaled via
-  /run/reboot-required so that the admin can (automatically) schedule a
-  reboot when convenient. This will also be more in line with future Debian
-  releases because starting with Debian bullseye, the kernel ships the
-  module. (contribution by @ypid)
+- Remove obsolete `.reload-module-on-update` file. It does not serve any function anymore after support for module reloading has been removed from the postinst script in 0.0.20200215-2 on 2020-02-24. A module update is properly signaled via /run/reboot-required so that the admin can (automatically) schedule a reboot when convenient. This will also be more in line with future Debian releases because starting with Debian bullseye, the kernel ships the module. (contribution by @ypid)
 
 - Add `ansible_managed` header to WireGuard configuration file (`wg0.conf` by default). This will most probably change the WireGuard configuration file but only the formatting. But since the Ansible registers this file as changed Ansible will sync/restart WireGuard service. For newer WireGuard versions (since Nov. 2019) this isn't a problem normally as `wg syncconf` command is used (also see `handlers/main.yml`). (contribution by @ypid)
 - Behind the scenes coding style improvements and cleanup without user impact. (contribution by @ypid)
diff --git a/tasks/setup-ubuntu.yml b/tasks/setup-ubuntu.yml
index 96ec017..c25b724 100644
--- a/tasks/setup-ubuntu.yml
+++ b/tasks/setup-ubuntu.yml
@@ -20,32 +20,20 @@
       - linux-headers-{{ ansible_kernel }}
     tags:
       - wg-install
-
-  - name: (Ubuntu) Add WireGuard repository (for Ubuntu < 19.10)
-    apt_repository:
-      repo: "ppa:wireguard/wireguard"
-      state: present
-      update_cache: yes
-    tags:
-      - wg-install
-
-  - name: (Ubuntu) Install WireGuard packages (for Ubuntu < 19.10)
-    apt:
-      name:
-        - "wireguard-dkms"
-        - "wireguard-tools"
-      state: present
-    tags:
-      - wg-install
   when:
     - ansible_lsb.major_release is version('19.10', '<')
 
-- block:
-  - name: (Ubuntu) Install wireguard-tools package (for Ubuntu > 19.04)
-    apt:
-      name: "wireguard-tools"
-      state: present
-    tags:
-      - wg-install
-  when:
-    - ansible_lsb.major_release is version('19.04', '>')
+- name: (Ubuntu) Ensure WireGuard DKMS package is removed
+  apt:
+    name:
+      - "wireguard-dkms"
+    state: absent
+  tags:
+    - wg-install
+
+- name: (Ubuntu) Install wireguard package
+  apt:
+    name: "wireguard"
+    state: present
+  tags:
+    - wg-install