From 9a0b8a7c91c41e34e06fd1754cc7e3807a41a181 Mon Sep 17 00:00:00 2001
From: TheRealDannyBoy <daniel@dstev.net>
Date: Wed, 3 Feb 2021 17:57:10 -0600
Subject: [PATCH] Mistyped variable name
---
tasks/nginx.yml | 18 +++++++++++++-----
tasks/packages.yml | 4 ++--
tasks/redis.yml | 4 ++--
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/tasks/nginx.yml b/tasks/nginx.yml
index 73c5da1..af83114 100644
--- a/tasks/nginx.yml
+++ b/tasks/nginx.yml
@@ -16,35 +16,43 @@
# from https://gist.github.com/mattiaslundberg/ba214a35060d3c8603e9b1ec8627d349
- name: Install snapd
- when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled
+ when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled and ansible_facts['ansible_os'] == 'Linux'
become: true
package:
name: snapd
state: present
- name: Prepare snapd for certbot installation
- when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled
+ when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled and ansible_facts['ansible_os'] == 'Linux'
become: true
command: snap install core
- name: Refresh core snap before installing certbot
- when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled
+ when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled and ansible_facts['ansible_os'] == 'Linux'
become: true
command: snap refresh core
- name: Install certbot snap
- when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled
+ when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled and ansible_facts['ansible_os'] == 'Linux'
become: true
command: snap install --classic certbot
- name: Link certbot snap installation
- when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled
+ when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled and ansible_facts['ansible_os'] == 'Linux'
become: true
file:
src: /snap/bin/certbot
dest: /usr/bin/certbot
state: link
+- name: Install certbot and certbot NGINX plugin from packages
+ when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled and ansible_facts['ansible_os'] == 'FreeBSD'
+ become: true
+ package:
+ name:
+ - "py37-certbot"
+ - "py37-certbot-nginx"
+
- name: Create letsencrypt certificate
when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled and not funkwhale_letsencrypt_skip_cert
become: true
diff --git a/tasks/packages.yml b/tasks/packages.yml
index 3626fca..23ec63f 100644
--- a/tasks/packages.yml
+++ b/tasks/packages.yml
@@ -1,7 +1,7 @@
---
- name: "Install system packages for Debian host"
become: true
- when: ansible_facts['ansible_family'] == 'Debian'
+ when: ansible_facts['ansible_os_family'] == 'Debian'
package:
name:
- "python3"
@@ -29,7 +29,7 @@
- name: "Install system packages for FreeBSD host"
become: true
- when: ansible_facts['ansible_family'] == 'FreeBSD'
+ when: ansible_facts['ansible_os_family'] == 'FreeBSD'
package:
name:
- "python3"
diff --git a/tasks/redis.yml b/tasks/redis.yml
index ad5ea5a..94ba154 100644
--- a/tasks/redis.yml
+++ b/tasks/redis.yml
@@ -1,14 +1,14 @@
---
- name: "Install redis on a Debian host"
become: true
- when: funkwhale_redis_managed and ansible_facts['ansible_family'] == 'Debian'
+ when: funkwhale_redis_managed and ansible_facts['ansible_os_family'] == 'Debian'
package:
name:
- redis-server
- name: "Install redis on a FreeBSD host"
become: true
- when: funkwhale_redis_managed and ansible_facts['ansible_family'] == 'FreeBSD'
+ when: funkwhale_redis_managed and ansible_facts['ansible_os_family'] == 'FreeBSD'
package:
name:
- redis
--
GitLab