From 0350f4bbebd0e9afd952611b377941bca269fb3c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Paul=20T=C3=B6tterman?= Date: Fri, 3 Jul 2020 13:08:01 +0300 Subject: [PATCH] Fix ansible for Ubuntu 20.04 Focal (#856) * Fix ansible for Ubuntu 20.04 Focal * Use proper version comparison * Changes based on feedback --- ansible/lemmy.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 }}' -- 2.44.1