summaryrefslogtreecommitdiffstats
path: root/ansible
diff options
context:
space:
mode:
Diffstat (limited to 'ansible')
-rw-r--r--ansible/VERSION2
-rw-r--r--ansible/lemmy.yml12
-rw-r--r--ansible/templates/docker-compose.yml2
3 files changed, 14 insertions, 2 deletions
diff --git a/ansible/VERSION b/ansible/VERSION
index 151a6866..935ddfd2 100644
--- a/ansible/VERSION
+++ b/ansible/VERSION
@@ -1 +1 @@
-v0.7.8
+v0.7.16
diff --git a/ansible/lemmy.yml b/ansible/lemmy.yml
index 5c8a5f91..3520c404 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 is version('20.04', '<')
+
+ - name: install certbot-nginx on ubuntu > 20
+ apt:
+ pkg:
+ - 'python3-certbot-nginx'
+ when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '>=')
- name: request initial letsencrypt certificate
command: certbot certonly --nginx --agree-tos -d '{{ domain }}' -m '{{ letsencrypt_contact_email }}'
diff --git a/ansible/templates/docker-compose.yml b/ansible/templates/docker-compose.yml
index 76c53463..f4c94fd7 100644
--- a/ansible/templates/docker-compose.yml
+++ b/ansible/templates/docker-compose.yml
@@ -35,7 +35,7 @@ services:
restart: always
iframely:
- image: jolt/iframely:v1.4.3
+ image: dogbin/iframely:latest
ports:
- "127.0.0.1:8061:80"
volumes: