Commit b6d00083 authored by markus's avatar markus

Update to new jitsi version including jitsi-videobridge2

parent 26bf53fb
......@@ -146,6 +146,12 @@
state: latest
update_cache: yes
cache_valid_time: 3600
- name: Install Jitsi Meet Turnserver
apt:
name: jitsi-meet-turnserver
state: latest
update_cache: yes
cache_valid_time: 3600
# Configuration
- name: Overwrite Nginx Site Config
......
......@@ -24,12 +24,15 @@ var config = {
// focus: 'focus.{{ jitsi_meet_server_name }}',
// XMPP MUC domain. FIXME: use XEP-0030 to discover it.
muc: 'conference.{{ jitsi_meet_server_name }}'
muc: 'conference.<!--# echo var="subdomain" default="" -->{{ jitsi_meet_server_name }}'
},
// BOSH URL. FIXME: use XEP-0156 to discover it.
bosh: '//{{ jitsi_meet_server_name }}/http-bind',
// Websocket URL
// websocket: 'wss://video.fnord.group/xmpp-websocket',
// The name of client node advertised in XEP-0115 'c' stanza
clientNode: 'http://jitsi.org/jitsimeet',
......@@ -72,6 +75,18 @@ var config = {
// Disable measuring of audio levels.
// disableAudioLevels: false,
// audioLevelsInterval: 200,
// Enabling this will run the lib-jitsi-meet no audio detection module which
// will notify the user if the current selected microphone has no audio
// input and will suggest another valid device if one is present.
enableNoAudioDetection: true,
// Enabling this will run the lib-jitsi-meet noise detection module which will
// notify the user if there is noise, other than voice, coming from the current
// selected microphone. The purpose it to let the user know that the input could
// be potentially unpleasant for other meeting participants.
enableNoisyMicDetection: true,
// Start the conference in audio only mode (no video is being received nor
// sent).
......@@ -95,7 +110,7 @@ var config = {
// w3c spec-compliant video constraints to use for video capture. Currently
// used by browsers that return true from lib-jitsi-meet's
// util#browser#usesNewGumFlow. The constraints are independency from
// util#browser#usesNewGumFlow. The constraints are independent from
// this config's resolution value. Defaults to requesting an ideal aspect
// ratio of 16:9 with an ideal resolution of 720.
// constraints: {
......@@ -155,7 +170,7 @@ var config = {
// Optional desktop sharing frame rate options. Default value: min:5, max:5.
desktopSharingFrameRate: {
min: 5,
max: 23
max: 33
},
// Try to start calls with screen-sharing instead of camera video.
......@@ -197,7 +212,7 @@ var config = {
// Misc
// Default value for the channel "last N" attribute. -1 for unlimited.
channelLastN: 3,
channelLastN: 11,
// Disables or enables RTX (RFC 4588) (defaults to false).
// disableRtx: false,
......@@ -287,16 +302,19 @@ var config = {
// estimation tests.
// gatherStats: false,
// The interval at which PeerConnection.getStats() is called. Defaults to 10000
// pcStatsInterval: 10000,
// To enable sending statistics to callstats.io you must provide the
// Application ID and Secret.
// callStatsID: '',
// callStatsSecret: '',
// enables sending participants display name to callstats
// enableDisplayNameInStats: false
// enableDisplayNameInStats: false,
// enables sending participants email if available to callstats and other analytics
// enableEmailInStats: false
// enableEmailInStats: false,
// Privacy
//
......@@ -324,9 +342,9 @@ var config = {
// The STUN servers that will be used in the peer to peer connections
stunServers: [
{ urls: 'stun:stun.l.google.com:19302' },
{ urls: 'stun:stun1.l.google.com:19302' },
{ urls: 'stun:stun2.l.google.com:19302' }
{ urls: 'stun:{{ jitsi_meet_server_name }}:443' },
// { urls: 'stun:meet-jit-si-turnrelay.jitsi.net:443' }
],
// Sets the ICE transport policy for the p2p connection. At the time
......@@ -370,7 +388,24 @@ var config = {
// shard: "shard1",
// region: "europe",
// userRegion: "asia"
}
},
// Decides whether the start/stop recording audio notifications should play on record.
// disableRecordAudioNotification: false,
// Information for the chrome extension banner
// chromeExtensionBanner: {
// // The chrome extension to be installed address
// url: 'https://chrome.google.com/webstore/detail/jitsi-meetings/kglhbbefdnlheedjiejgomgmfplipfeb',
// // Extensions info which allows checking if they are installed or not
// chromeExtensionsInfo: [
// {
// id: 'kglhbbefdnlheedjiejgomgmfplipfeb',
// path: 'jitsi-logo-48x48.png'
// }
// ]
// },
// Local Recording
//
......@@ -388,7 +423,7 @@ var config = {
// format: 'flac'
//
// }
// },
// Options related to end-to-end (participant to participant) ping.
// e2eping: {
......@@ -400,22 +435,22 @@ var config = {
// // with the measured RTT will be sent. Defaults to 60000, set
// // to <= 0 to disable.
// analyticsInterval: 60000,
// }
// },
// If set, will attempt to use the provided video input device label when
// triggering a screenshare, instead of proceeding through the normal flow
// for obtaining a desktop stream.
// NOTE: This option is experimental and is currently intended for internal
// use only.
// _desktopSharingSourceDevice: 'sample-id-or-label'
// _desktopSharingSourceDevice: 'sample-id-or-label',
// If true, any checks to handoff to another application will be prevented
// and instead the app will continue to display in the current browser.
// disableDeepLinking: false
disableDeepLinking: true,
// A property to disable the right click context menu for localVideo
// the menu has option to flip the locally seen video for local presentations
// disableLocalVideoFlip: false
// disableLocalVideoFlip: false,
// Deployment specific URLs.
// deploymentUrls: {
......@@ -425,7 +460,16 @@ var config = {
// // If specified a 'Download our apps' button will be displayed in the overflow menu with a link
// // to the specified URL for an app download page.
// downloadAppsUrl: 'https://docs.example.com/our-apps.html'
// }
// },
// Options related to the remote participant menu.
// remoteVideoMenu: {
// // If set to true the 'Kick out' button will be disabled.
// disableKick: true
// },
// If set to true all muting operations of remote participants will be disabled.
// disableRemoteMute: true,
// List of undocumented settings used in jitsi-meet
/**
......@@ -477,6 +521,12 @@ var config = {
startBitrate
*/
// Allow all above example options to include a trailing comma and
// prevent fear when commenting out the last value.
makeJsonParserHappy: 'even if last key had a trailing comma'
// no configuration value should follow this line.
};
/* eslint-enable no-unused-vars, no-var */
......@@ -7,7 +7,7 @@ server {
return 301 https://$host$request_uri;
}
server {
listen [::]:443 ssl ipv6only=off;
listen [::]:4444 ssl ipv6only=off;
server_name {{ jitsi_meet_server_name }};
ssl_session_timeout 1d;
......@@ -30,7 +30,11 @@ server {
ssl_certificate_key /etc/letsencrypt/live/{{ jitsi_meet_server_name }}/privkey.pem;
root /usr/share/jitsi-meet;
# ssi on with javascript for multidomain variables in config.js
ssi on;
ssi_types application/x-javascript application/javascript;
index index.html index.htm;
error_page 404 /static/404.html;
......@@ -56,6 +60,16 @@ server {
proxy_set_header Host $http_host;
}
# xmpp websockets
location = /xmpp-websocket {
proxy_pass http://127.0.0.1:5280/xmpp-websocket?prefix=$prefix&$args;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Host $http_host;
tcp_nodelay on;
}
location ~ ^/([^/?&:'"]+)$ {
try_files $uri @root_path;
}
......@@ -63,4 +77,37 @@ server {
location @root_path {
rewrite ^/(.*)$ / break;
}
location ~ ^/([^/?&:'"]+)/config.js$
{
set $subdomain "$1.";
set $subdir "$1/";
alias /etc/jitsi/meet/video.fnord.group-config.js;
}
#Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to /
location ~ ^/([^/?&:'"]+)/(.*)$ {
set $subdomain "$1.";
set $subdir "$1/";
rewrite ^/([^/?&:'"]+)/(.*)$ /$2;
}
# BOSH for subdomains
location ~ ^/([^/?&:'"]+)/http-bind {
set $subdomain "$1.";
set $subdir "$1/";
set $prefix "$1";
rewrite ^/(.*)$ /http-bind;
}
# websockets for subdomains
location ~ ^/([^/?&:'"]+)/xmpp-websocket {
set $subdomain "$1.";
set $subdir "$1/";
set $prefix "$1";
rewrite ^/(.*)$ /xmpp-websocket;
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment