From 93bc4bbd0fc8794e28a730ede30b056ec8e857c1 Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Mon, 23 Mar 2020 21:48:40 +0100 Subject: [PATCH 1/3] 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) From 554b87ec414e846ec86280b6f362dad3aae76b63 Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Mon, 23 Mar 2020 21:51:10 +0100 Subject: [PATCH 2/3] Added default var docker_user --- defaults/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/defaults/main.yml b/defaults/main.yml index 129d4ae..47418b4 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,6 @@ --- # defaults file for jitsi +docker_user: deploy #jitsi_letsencrypt_email:alice@host.tld jitsi_enable_letsencrypt: False jitsi_exposed_http_port: 8000 From aacd838f56b68cb22cc1f8e1a70e81d2ad432d16 Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Mon, 23 Mar 2020 21:53:30 +0100 Subject: [PATCH 3/3] Removed not used jitsi_container_ip; use virtual host as part of the public URL by default --- defaults/main.yml | 6 +++--- tasks/main.yml | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 47418b4..c4b7667 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -5,6 +5,6 @@ docker_user: deploy 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 +jitsi_virtual_host: localhost +jitsi_public_url: http://{{ jitsi_virtual_host }} +jitsi_timezone: Europe/Amsterdam \ No newline at end of file diff --git a/tasks/main.yml b/tasks/main.yml index b0afd5d..cb25842 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -52,10 +52,6 @@ that: - "output.ansible_facts['web']['jitsi_web_1'].state.running" -- name: Get container IP - set_fact: - jitsi_container_ip: "{{ output.ansible_facts['web']['jitsi_web_1']['networks']['jitsi_meet.jitsi'].IPAddress }}" - - name: "Waiting for Jitsi container to become available" become: false wait_for: