Update to 2020-11-19 20:00

master
Daniel Berteaud 4 years ago
parent 276ded1e44
commit 4fe0a66090
  1. 2
      roles/etherpad/meta/main.yml
  2. 15
      roles/jitsi/defaults/main.yml
  3. 3
      roles/letsencrypt/templates/domains.txt.j2
  4. 1
      roles/nginx/tasks/conf.yml
  5. 10
      roles/prosody/tasks/install.yml

@ -2,3 +2,5 @@
dependencies: dependencies:
- role: repo_nodejs - role: repo_nodejs
- role: mysql_server
when: etherpad_db_server in ['localhost','127.0.0.1']

@ -115,13 +115,16 @@ jitsi_meet_interface_conf_base:
DEFAULT_LOCAL_DISPLAY_NAME: Me DEFAULT_LOCAL_DISPLAY_NAME: Me
SHOW_JITSI_WATERMARK: False SHOW_JITSI_WATERMARK: False
JITSI_WATERMARK_LINK: 'https://jitsi.org' JITSI_WATERMARK_LINK: 'https://jitsi.org'
SHOW_WATERMARK_FOR_GUESTS: False
SHOW_BRAND_WATERMARK: False SHOW_BRAND_WATERMARK: False
BRAND_WATERMARK_LINK: 'https://www.firewall-services.com' 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' PROVIDER_NAME: 'Firewall Services'
SHOW_POWERED_BY: False SHOW_POWERED_BY: False
SHOW_DEEP_LINKING_IMAGE: 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 DISPLAY_WELCOME_PAGE_TOOLBAR_ADDITIONAL_CONTENT: False
GENERATE_ROOMNAMES_ON_WELCOME_PAGE: True GENERATE_ROOMNAMES_ON_WELCOME_PAGE: True
APP_NAME: Jitsi Meet APP_NAME: Jitsi Meet
@ -166,7 +169,6 @@ jitsi_meet_interface_conf_base:
- calendar - calendar
VIDEO_LAYOUT_FIT: both VIDEO_LAYOUT_FIT: both
VERTICAL_FILMSTRIP: True VERTICAL_FILMSTRIP: True
filmStripOnly: False
CLOSE_PAGE_GUEST_HINT: False CLOSE_PAGE_GUEST_HINT: False
SHOW_PROMOTIONAL_CLOSE_PAGE: False SHOW_PROMOTIONAL_CLOSE_PAGE: False
RANDOM_AVATAR_URL_PREFIX: False RANDOM_AVATAR_URL_PREFIX: False
@ -184,6 +186,9 @@ jitsi_meet_interface_conf_base:
REMOTE_THUMBNAIL_RATIO: 1 # 1:1 REMOTE_THUMBNAIL_RATIO: 1 # 1:1
LIVE_STREAMING_HELP_LINK: 'https://jitsi.org/live' LIVE_STREAMING_HELP_LINK: 'https://jitsi.org/live'
MOBILE_APP_PROMO: True 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 MAXIMUM_ZOOMING_COEFFICIENT: 1.3
SUPPORT_URL: https://community.jitsi.org/ SUPPORT_URL: https://community.jitsi.org/
CONNECTION_INDICATOR_AUTO_HIDE_ENABLED: True 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: jitsi_meet_custom_lang:
fr: fr:
welcomepage: welcomepage:
title: >- headerSubtitle: >-
La vidéoconférence simple, sécurisée, libre La vidéoconférence simple, sécurisée, libre
startMeeting: >-
C'est parti !
appDescription: >- appDescription: >-
Choisissez un nom ou bien laisser le système en créer un pour vous, Choisissez un nom ou bien laisser le système en créer un pour vous,
partagez le lien avec qui vous voulez. partagez le lien avec qui vous voulez.

@ -36,3 +36,6 @@
{% if jitsi_letsencrypt_cert is defined and jitsi_letsencrypt_cert == True and jitsi_domain is defined %} {% if jitsi_letsencrypt_cert is defined and jitsi_letsencrypt_cert == True and jitsi_domain is defined %}
{{ jitsi_domain }} auth.{{ jitsi_domain }} {{ jitsi_domain }} auth.{{ jitsi_domain }}
{% endif %} {% endif %}
{% if turn_letsencrypt_cert is defined and turn_letsencrypt_cert not in letsencrypt_certs | default([]) | map(attribute='common_name') %}
{{ turn_letsencrypt_cert }}
{% endif %}

@ -63,4 +63,5 @@
loop: loop:
- error.log - error.log
- access.log - access.log
changed_when: False
tags: web tags: web

@ -20,14 +20,8 @@
notify: restart prosody notify: restart prosody
tags: prosody tags: prosody
- name: Customize prosody service unit - name: Remove useless unit override
copy: file: path=/etc/systemd/system/prosody.service.d/99-ansible.conf state=absent
content: |
[Service]
Type=simple
User=prosody
Group=prosody
dest: /etc/systemd/system/prosody.service.d/99-ansible.conf
register: prosody_unit register: prosody_unit
notify: restart prosody notify: restart prosody
tags: prosody tags: prosody

Loading…
Cancel
Save