From 4fe0a66090f3d44a1ff078d2e62f92bfed51da13 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu, 19 Nov 2020 20:00:09 +0100
Subject: [PATCH] Update to 2020-11-19 20:00

---
 roles/etherpad/meta/main.yml               |  2 ++
 roles/jitsi/defaults/main.yml              | 15 +++++++++++----
 roles/letsencrypt/templates/domains.txt.j2 |  3 +++
 roles/nginx/tasks/conf.yml                 |  1 +
 roles/prosody/tasks/install.yml            | 10 ++--------
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/roles/etherpad/meta/main.yml b/roles/etherpad/meta/main.yml
index a317f2c..20b5b67 100644
--- a/roles/etherpad/meta/main.yml
+++ b/roles/etherpad/meta/main.yml
@@ -2,3 +2,5 @@
 
 dependencies:
   - role: repo_nodejs
+  - role: mysql_server
+    when: etherpad_db_server in ['localhost','127.0.0.1']
diff --git a/roles/jitsi/defaults/main.yml b/roles/jitsi/defaults/main.yml
index 5610e7a..f999ee3 100644
--- a/roles/jitsi/defaults/main.yml
+++ b/roles/jitsi/defaults/main.yml
@@ -115,13 +115,16 @@ jitsi_meet_interface_conf_base:
   DEFAULT_LOCAL_DISPLAY_NAME: Me
   SHOW_JITSI_WATERMARK: False
   JITSI_WATERMARK_LINK: 'https://jitsi.org'
-  SHOW_WATERMARK_FOR_GUESTS: False
   SHOW_BRAND_WATERMARK: False
   BRAND_WATERMARK_LINK: 'https://www.firewall-services.com'
+  DEFAULT_WELCOME_PAGE_LOGO_URL: 'images/watermark.svg'
+  DEFAULT_LOGO_URL: 'images/watermark.svg'
   PROVIDER_NAME: 'Firewall Services'
   SHOW_POWERED_BY: False
   SHOW_DEEP_LINKING_IMAGE: False
-  DISPLAY_WELCOME_PAGE_CONTENT: True
+  DISPLAY_WELCOME_FOOTER: True,
+  DISPLAY_WELCOME_PAGE_ADDITIONAL_CARD: False
+  DISPLAY_WELCOME_PAGE_CONTENT: False
   DISPLAY_WELCOME_PAGE_TOOLBAR_ADDITIONAL_CONTENT: False
   GENERATE_ROOMNAMES_ON_WELCOME_PAGE: True
   APP_NAME: Jitsi Meet
@@ -166,7 +169,6 @@ jitsi_meet_interface_conf_base:
     - calendar
   VIDEO_LAYOUT_FIT: both
   VERTICAL_FILMSTRIP: True
-  filmStripOnly: False
   CLOSE_PAGE_GUEST_HINT: False
   SHOW_PROMOTIONAL_CLOSE_PAGE: False
   RANDOM_AVATAR_URL_PREFIX: False
@@ -184,6 +186,9 @@ jitsi_meet_interface_conf_base:
   REMOTE_THUMBNAIL_RATIO: 1 # 1:1
   LIVE_STREAMING_HELP_LINK: 'https://jitsi.org/live'
   MOBILE_APP_PROMO: True
+  MOBILE_DOWNLOAD_LINK_ANDROID: 'https://play.google.com/store/apps/details?id=org.jitsi.meet'
+  MOBILE_DOWNLOAD_LINK_F_DROID: 'https://f-droid.org/en/packages/org.jitsi.meet/'
+  MOBILE_DOWNLOAD_LINK_IOS: 'https://itunes.apple.com/us/app/jitsi-meet/id1165103905'
   MAXIMUM_ZOOMING_COEFFICIENT: 1.3
   SUPPORT_URL: https://community.jitsi.org/
   CONNECTION_INDICATOR_AUTO_HIDE_ENABLED: True
@@ -212,8 +217,10 @@ jitsi_meet_interface_conf: "{{ jitsi_meet_interface_conf_base | combine(jitsi_me
 jitsi_meet_custom_lang:
   fr:
     welcomepage:
-      title: >-
+      headerSubtitle: >-
         La vidéoconférence simple, sécurisée, libre
+      startMeeting: >-
+        C'est parti !
       appDescription: >-
         Choisissez un nom ou bien laisser le système en créer un pour vous,
         partagez le lien avec qui vous voulez.
diff --git a/roles/letsencrypt/templates/domains.txt.j2 b/roles/letsencrypt/templates/domains.txt.j2
index e7efa22..56fa04d 100644
--- a/roles/letsencrypt/templates/domains.txt.j2
+++ b/roles/letsencrypt/templates/domains.txt.j2
@@ -36,3 +36,6 @@
 {% if jitsi_letsencrypt_cert is defined and jitsi_letsencrypt_cert == True and jitsi_domain is defined %}
 {{ jitsi_domain }} auth.{{ jitsi_domain }}
 {% endif %}
+{% if turn_letsencrypt_cert is defined and turn_letsencrypt_cert not in letsencrypt_certs | default([]) | map(attribute='common_name') %}
+{{ turn_letsencrypt_cert }}
+{% endif %}
diff --git a/roles/nginx/tasks/conf.yml b/roles/nginx/tasks/conf.yml
index cecf5f8..6c6e8fd 100644
--- a/roles/nginx/tasks/conf.yml
+++ b/roles/nginx/tasks/conf.yml
@@ -63,4 +63,5 @@
   loop:
     - error.log
     - access.log
+  changed_when: False
   tags: web
diff --git a/roles/prosody/tasks/install.yml b/roles/prosody/tasks/install.yml
index 9bb2ca3..4d57027 100644
--- a/roles/prosody/tasks/install.yml
+++ b/roles/prosody/tasks/install.yml
@@ -20,14 +20,8 @@
   notify: restart prosody
   tags: prosody
 
-- name: Customize prosody service unit
-  copy:
-    content: |
-      [Service]
-      Type=simple
-      User=prosody
-      Group=prosody
-    dest: /etc/systemd/system/prosody.service.d/99-ansible.conf
+- name: Remove useless unit override
+  file: path=/etc/systemd/system/prosody.service.d/99-ansible.conf state=absent
   register: prosody_unit
   notify: restart prosody
   tags: prosody