From 93bc4bbd0fc8794e28a730ede30b056ec8e857c1 Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Mon, 23 Mar 2020 21:48:40 +0100 Subject: [PATCH] Added default vars, only provide Let's Encrypt config if enabled --- defaults/main.yml | 7 +++++++ templates/env.jitsi.j2 | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index e3bcc12..129d4ae 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,2 +1,9 @@ --- # defaults file for jitsi +#jitsi_letsencrypt_email:alice@host.tld +jitsi_enable_letsencrypt: False +jitsi_exposed_http_port: 8000 +jitsi_exposed_https_port: 8443 +jitsi_public_url: http://localhost +jitsi_timezone: Europe/Amsterdam +jitsi_virtual_host: localhost \ No newline at end of file diff --git a/templates/env.jitsi.j2 b/templates/env.jitsi.j2 index e0bcf79..5281d34 100644 --- a/templates/env.jitsi.j2 +++ b/templates/env.jitsi.j2 @@ -22,19 +22,21 @@ VIRTUAL_HOST={{ jitsi_virtual_host }} # in the README. DOCKER_HOST_ADDRESS={{ jitsi_docker_host_address }} +{% if jitsi_enable_letsencrypt %} # # Let's Encrypt configuration # # Enable Let's Encrypt certificate generation. -ENABLE_LETSENCRYPT={{ 1 if jitsi_enable_letsencrypt == True else 0 }} +ENABLE_LETSENCRYPT=0 # Domain for which to generate the certificate. -#LETSENCRYPT_DOMAIN=meet.example.com +LETSENCRYPT_DOMAIN={{ jitsi_virtual_host }} # E-Mail for receiving important account notifications (mandatory). -#LETSENCRYPT_EMAIL=alice@atlanta.net +LETSENCRYPT_EMAIL={{ jitsi_letsencrypt_email }} +{% endif -%} # # Etherpad integration (for document sharing)