Update to 2020-04-23 19:00

master
Daniel Berteaud 5 years ago
parent c5761ad0c6
commit 7cf4d2147c
  1. 23
      roles/freepbx/files/agi/jitsi_conf_pin
  2. 7
      roles/freepbx/tasks/main.yml
  3. 18
      roles/jitsi/defaults/main.yml
  4. 2
      roles/jitsi/tasks/conf.yml
  5. 5
      roles/jitsi/tasks/facts.yml
  6. 10
      roles/jitsi/tasks/install.yml
  7. 4
      roles/jitsi/templates/jigasi/sip-communicator.properties.j2
  8. 3
      roles/jitsi_videobridge/defaults/main.yml
  9. 2
      roles/jitsi_videobridge/tasks/install.yml
  10. 2
      roles/matrix_synapse/defaults/main.yml
  11. 2
      roles/prosody/tasks/main.yml

@ -0,0 +1,23 @@
#!/usr/bin/perl
use warnings;
use strict;
use LWP::UserAgent;
use JSON;
my $ret = 'error';
my $url = $ARGV[0] . '?id=' . $ARGV[1];
my $ua = LWP::UserAgent->new(timeout => 10);
$ua->env_proxy;
my $response = $ua->get($url);
if ($response->is_success){
my $json = from_json($response->content);
if (defined $json and defined $json->{conference}){
$ret = $json->{conference};
$ret =~ s/@.*//;
}
}
print "SET VARIABLE JITSI_ROOM $ret\n";

@ -19,6 +19,7 @@
- mysql-connector-odbc - mysql-connector-odbc
- mpg123 - mpg123
- lame - lame
- opus
- nmap - nmap
- nodejs - nodejs
#- kmod-dahdi-linux #- kmod-dahdi-linux
@ -403,6 +404,12 @@
- post - post
tags: fpbx tags: fpbx
- name: Install agi scripts
copy: src=agi/{{ item }} dest=/usr/share/asterisk/agi-bin/{{ item }} mode=750 group=asterisk
loop:
- jitsi_conf_pin
tags: fpbx
- name: Handle FreePBX ports - name: Handle FreePBX ports
iptables_raw: iptables_raw:
name: "{{ item.name }}" name: "{{ item.name }}"

@ -13,6 +13,9 @@ jitsi_jicofo_git_url: https://github.com/jitsi/jicofo.git
jitsi_jigasi_git_url: https://github.com/jitsi/jigasi.git jitsi_jigasi_git_url: https://github.com/jitsi/jigasi.git
jitsi_meet_git_url: https://github.com/jitsi/jitsi-meet.git jitsi_meet_git_url: https://github.com/jitsi/jitsi-meet.git
# Should ansible handle upgrades, or only initial install ?
jitsi_manage_upgrade: True
# XMPP server to connect to. Default is the same machine # XMPP server to connect to. Default is the same machine
jitsi_xmpp_server: "{{ inventory_hostname }}" jitsi_xmpp_server: "{{ inventory_hostname }}"
# Port on which to connect to the XMPP server to register as a component # Port on which to connect to the XMPP server to register as a component
@ -67,11 +70,12 @@ jitsi_meet_conf_base:
bosh: '//{{ jitsi_domain }}/http-bind' bosh: '//{{ jitsi_domain }}/http-bind'
websocket: 'wss://{{ jitsi_domain }}/xmpp-websocket' websocket: 'wss://{{ jitsi_domain }}/xmpp-websocket'
clientNode: http://jitsi.org/jitsimeet clientNode: http://jitsi.org/jitsimeet
focusUserJid: "{{ jitsi_jicofo_xmpp_user }}@{{ jitsi_auth_domain }}"
disableAudioLevels: True disableAudioLevels: True
testing: testing:
p2pTestMode: False p2pTestMode: False
enableNoAudioDetection: True enableNoAudioDetection: True
enableNoisyMicDetection: True enableNoisyMicDetection: False
desktopSharingChromeExtId: null desktopSharingChromeExtId: null
desktopSharingChromeSources: desktopSharingChromeSources:
- screen - screen
@ -80,9 +84,14 @@ jitsi_meet_conf_base:
desktopSharingChromeMinExtVersion: 0.1 desktopSharingChromeMinExtVersion: 0.1
channelLastN: -1 channelLastN: -1
requireDisplayName: False requireDisplayName: False
resolution: 480
enableLayerSuspension: True
enableCalendarIntegration: False enableCalendarIntegration: False
disableThirdPartyRequests: True disableThirdPartyRequests: True
enableWelcomePage: True enableWelcomePage: True
useStunTurn: True
localRecording:
enabled: True
p2p: p2p:
enabled: True enabled: True
useStunTurn: True useStunTurn: True
@ -143,10 +152,11 @@ jitsi_meet_interface_conf_base:
- stats - stats
- shortcuts - shortcuts
- tileview - tileview
#- videobackgroundblur - videobackgroundblur
- download - download
- help - help
- mute-everyone - mute-everyone
#- localrecording
SETTINGS_SECTIONS: SETTINGS_SECTIONS:
- devices - devices
- language - language
@ -214,6 +224,8 @@ jitsi_jigasi_default_room: sip
#jitsi_jigasi_sip_user: #jitsi_jigasi_sip_user:
#jitsi_jigasi_sip_secret: #jitsi_jigasi_sip_secret:
#jitsi_jigasi_sip_server: #jitsi_jigasi_sip_server:
jitsi_jigasi_sip_port: 5060
jitsi_jigasi_sip_transport: UDP
jitsi_jigasi_xmpp_user: jigasi jitsi_jigasi_xmpp_user: jigasi
jitsi_jigasi_xmpp_domain: "{{ jitsi_auth_domain }}" jitsi_jigasi_xmpp_domain: "{{ jitsi_auth_domain }}"
@ -234,7 +246,7 @@ jitsi_confmapper_conf_base:
port: "{{ jitsi_confmapper_port }}" port: "{{ jitsi_confmapper_port }}"
host: 0.0.0.0 host: 0.0.0.0
expire_seconds: 86400 expire_seconds: 86400
id_max_length: 5 id_max_length: 4
db_file: "{{ jitsi_root_dir }}/data/confmapper.sqlite" db_file: "{{ jitsi_root_dir }}/data/confmapper.sqlite"
jitsi_confmapper_conf_extra: {} jitsi_confmapper_conf_extra: {}
jitsi_confmapper_conf: "{{ jitsi_confmapper_conf_base | combine(jitsi_confmapper_conf_extra, recursive=True) }}" jitsi_confmapper_conf: "{{ jitsi_confmapper_conf_base | combine(jitsi_confmapper_conf_extra, recursive=True) }}"

@ -32,7 +32,7 @@
notify: restart jitsi-jicofo notify: restart jitsi-jicofo
tags: jitsi tags: jitsi
- name: Deploy jigasiconfiguration - name: Deploy jigasi configuration
template: src=jigasi/{{ item }}.j2 dest={{ jitsi_root_dir }}/etc/jigasi/{{ item }} group={{ jitsi_user }} mode=640 template: src=jigasi/{{ item }}.j2 dest={{ jitsi_root_dir }}/etc/jigasi/{{ item }} group={{ jitsi_user }} mode=640
loop: loop:
- jigasi.conf - jigasi.conf

@ -88,3 +88,8 @@
stat: path={{ jitsi_root_dir }}/jigasi/jigasi.sh stat: path={{ jitsi_root_dir }}/jigasi/jigasi.sh
register: jitsi_jigasi_script register: jitsi_jigasi_script
tags: jitsi tags: jitsi
- name: Check if meet is installed
stat: path={{ jitsi_root_dir }}/meet/index.html
register: jitsi_meet_index
tags: jitsi

@ -4,6 +4,7 @@
yum: yum:
name: name:
- java-1.8.0-openjdk - java-1.8.0-openjdk
- java-1.8.0-openjdk-devel
- git - git
- nodejs # needed to build meet - nodejs # needed to build meet
- libXScrnSaver # needed for jigasi - libXScrnSaver # needed for jigasi
@ -61,7 +62,7 @@
delete: True delete: True
delegate_to: "{{ inventory_hostname }}" delegate_to: "{{ inventory_hostname }}"
notify: restart jitsi-jicofo notify: restart jitsi-jicofo
when: jitsi_jicofo_git.changed or not jitsi_jicofo_script.stat.exists when: (jitsi_jicofo_git.changed and jitsi_manage_upgrade) or not jitsi_jicofo_script.stat.exists
tags: jitsi tags: jitsi
- name: Clone jigasi repo - name: Clone jigasi repo
@ -98,7 +99,7 @@
delete: True delete: True
delegate_to: "{{ inventory_hostname }}" delegate_to: "{{ inventory_hostname }}"
notify: restart jitsi-jigasi notify: restart jitsi-jigasi
when: jitsi_jigasi_git.changed or not jitsi_jigasi_script.stat.exists when: (jitsi_jigasi_git.changed and jitsi_manage_upgrade) or not jitsi_jigasi_script.stat.exists
tags: jitsi tags: jitsi
- name: Deploy systemd unit - name: Deploy systemd unit
@ -128,8 +129,7 @@
become_user: "{{ jitsi_user }}" become_user: "{{ jitsi_user }}"
tags: jitsi tags: jitsi
- when: jitsi_meet_git.changed - name: Install or update jitsi meet
tags: jitsi
block: block:
- name: Install jitsi meet node dependencies - name: Install jitsi meet node dependencies
npm: path={{ jitsi_root_dir }}/src/meet npm: path={{ jitsi_root_dir }}/src/meet
@ -149,6 +149,8 @@
cp css/all.css {{ jitsi_root_dir }}/meet/css/ cp css/all.css {{ jitsi_root_dir }}/meet/css/
args: args:
chdir: "{{ jitsi_root_dir }}/src/meet" chdir: "{{ jitsi_root_dir }}/src/meet"
when: (jitsi_meet_git.changed and jitsi_manage_upgrade) or not jitsi_meet_index.stat.exists
tags: jitsi
- name: Install dehydrated hook - name: Install dehydrated hook
template: src=dehydrated_hook.sh.j2 dest=/etc/dehydrated/hooks_deploy_cert.d/jitsi.sh mode=755 template: src=dehydrated_hook.sh.j2 dest=/etc/dehydrated/hooks_deploy_cert.d/jitsi.sh mode=755

@ -23,6 +23,10 @@ net.java.sip.communicator.impl.protocol.sip.acc.KEEP_ALIVE_METHOD=OPTIONS
net.java.sip.communicator.impl.protocol.sip.acc.VOICEMAIL_ENABLED=false net.java.sip.communicator.impl.protocol.sip.acc.VOICEMAIL_ENABLED=false
net.java.sip.communicator.impl.protocol.sip.acc.OVERRIDE_ENCODINGS=false net.java.sip.communicator.impl.protocol.sip.acc.OVERRIDE_ENCODINGS=false
net.java.sip.communicator.impl.protocol.sip.acc.DOMAIN_BASE={{ jitsi_domain }} net.java.sip.communicator.impl.protocol.sip.acc.DOMAIN_BASE={{ jitsi_domain }}
net.java.sip.communicator.impl.protocol.sip.acc.PROXY_ADDRESS={{ jitsi_jigasi_sip_server }}
net.java.sip.communicator.impl.protocol.sip.acc.PROXY_AUTO_CONFIG=false
net.java.sip.communicator.impl.protocol.sip.acc.PROXY_PORT={{ jitsi_jigasi_sip_port }}
net.java.sip.communicator.impl.protocol.sip.acc.PREFERRED_TRANSPORT={{ jitsi_jigasi_sip_transport }}
{% else %} {% else %}
# No SIP acc configured, jigasi will be disabled # No SIP acc configured, jigasi will be disabled
{% endif %} {% endif %}

@ -5,6 +5,9 @@ jitsi_user: jitsi
jitsi_videobridge_git_url: https://github.com/jitsi/jitsi-videobridge.git jitsi_videobridge_git_url: https://github.com/jitsi/jitsi-videobridge.git
# Should ansible manage upgrades or only initial install
jitsi_videobridge_manage_upgrade: "{{ jitsi_manage_upgrade | default(True) }}"
jitsi_videobridge_harvester_port: 4443 jitsi_videobridge_harvester_port: 4443
jitsi_videobridge_rtp_port: 10000 jitsi_videobridge_rtp_port: 10000
jitsi_videobridge_src_ip: jitsi_videobridge_src_ip:

@ -45,7 +45,7 @@
delegate_to: "{{ inventory_hostname }}" delegate_to: "{{ inventory_hostname }}"
notify: restart jitsi-videobridge notify: restart jitsi-videobridge
when: jitsi_videobridge_git.changed or not jitsi_videobridge_script.stat.exists when: (jitsi_videobridge_git.changed and jitsi_videobridge_manage_upgrade) or not jitsi_videobridge_script.stat.exists
tags: jitsi tags: jitsi
- name: Deploy systemd unit - name: Deploy systemd unit

@ -1,7 +1,7 @@
--- ---
# Synapse version to deploy # Synapse version to deploy
synapse_version: 1.12.1 synapse_version: 1.12.4
# Synapse install dir # Synapse install dir
synapse_root_dir: /opt/matrix/synapse synapse_root_dir: /opt/matrix/synapse

@ -1,7 +1,7 @@
--- ---
- include: install.yml
- include: directories.yml - include: directories.yml
- include: install.yml
- include: facts.yml - include: facts.yml
- include: conf.yml - include: conf.yml
- include: iptables.yml - include: iptables.yml

Loading…
Cancel
Save