From ae4e10c5a48ff303275e097be4de0cfd46cb414f Mon Sep 17 00:00:00 2001
From: Jonathan Hanson <jonathan@jonathan-hanson.org>
Date: Sat, 16 Feb 2019 14:44:05 -0800
Subject: [PATCH] Ensure debian-like distributions get the latest version of
 certbot - Remove the non-standard Ubuntu 16.04 package and script name
 (letsencrypt vs certbot) - Add the EFF-maintained certbot PPA

---
 tasks/install-with-package.yml | 5 +++++
 vars/Ubuntu-16.04.yml          | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)
 delete mode 100644 vars/Ubuntu-16.04.yml

diff --git a/tasks/install-with-package.yml b/tasks/install-with-package.yml
index 10490ff..1c1f921 100644
--- a/tasks/install-with-package.yml
+++ b/tasks/install-with-package.yml
@@ -1,4 +1,9 @@
 ---
+- name: Ensure package repo is present
+  apt_repository:
+    repo: ppa:certbot/certbot
+  when: ansible_distribution == "Ubuntu" or ansible_distribution == "Debian"
+
 - name: Install Certbot.
   package: "name={{ certbot_package }} state=present"
 
diff --git a/vars/Ubuntu-16.04.yml b/vars/Ubuntu-16.04.yml
deleted file mode 100644
index 83cf124..0000000
--- a/vars/Ubuntu-16.04.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-certbot_package: letsencrypt