From: Paul Tötterman <ptman@users.noreply.github.com>
Date: Fri, 3 Jul 2020 10:08:01 +0000 (+0300)
Subject: Fix ansible for Ubuntu 20.04 Focal (#856)
X-Git-Url: http://these/git/%22https:/join-lemmy.org/%22%7B%7D/static/%7BelementUrl%7D?a=commitdiff_plain;h=0350f4bbebd0e9afd952611b377941bca269fb3c;p=lemmy.git

Fix ansible for Ubuntu 20.04 Focal (#856)

* Fix ansible for Ubuntu 20.04 Focal

* Use proper version comparison

* Changes based on feedback
---

diff --git a/ansible/lemmy.yml b/ansible/lemmy.yml
index 5c8a5f91..a73f7293 100644
--- a/ansible/lemmy.yml
+++ b/ansible/lemmy.yml
@@ -11,6 +11,7 @@
       when: lemmy_base_dir is not defined
 
     - name: install python for Ansible
+      # python2-minimal instead of python-minimal for ubuntu 20.04 and up
       raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal python-setuptools)
       args:
         executable: /bin/bash
@@ -27,7 +28,18 @@
         - 'docker-compose'
         - 'docker.io'
         - 'certbot'
+
+  - name: install certbot-nginx on ubuntu < 20
+    apt:
+      pkg:
         - 'python-certbot-nginx'
+    when: ansible_distribution == 'Ubuntu' and ansible_distribution_version|version_compare('20.04', '<')
+
+  - name: install certbot-nginx on ubuntu > 20
+    apt:
+      pkg:
+        - 'python3-certbot-nginx'
+    when: ansible_distribution == 'Ubuntu' and ansible_distribution_version|version_compare('20.04', '>=')
 
   - name: request initial letsencrypt certificate
     command: certbot certonly --nginx --agree-tos -d '{{ domain }}' -m '{{ letsencrypt_contact_email }}'