diff --git a/conf/jitsi-jicofo-jicofo.conf b/conf/jitsi-jicofo-jicofo.conf new file mode 100644 index 0000000..fd8a530 --- /dev/null +++ b/conf/jitsi-jicofo-jicofo.conf @@ -0,0 +1,3 @@ +#available options, syntax, and default values. +jicofo { +} diff --git a/conf/jitsi-videobridge-jvb.conf b/conf/jitsi-videobridge-jvb.conf new file mode 100644 index 0000000..b6e631a --- /dev/null +++ b/conf/jitsi-videobridge-jvb.conf @@ -0,0 +1,12 @@ +videobridge { + http-servers { + public { + port = 9090 + } + } + websockets { + enabled = true + domain = "__DOMAIN__:443" + tls = true + } +} \ No newline at end of file diff --git a/conf/nginx.conf b/conf/nginx.conf index 586a961..63efaed 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -20,15 +20,18 @@ location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|. { add_header 'Access-Control-Allow-Origin' '*'; alias __FINALPATH__/jitsi-meet-web/$1/$2; + + # cache all versioned files + if ($arg_v) { + expires 1y; + } } # BOSH location = /http-bind { proxy_pass http://127.0.0.1:5290/http-bind; - proxy_set_header Host $host; proxy_set_header X-Forwarded-For $remote_addr; - proxy_buffering off; - tcp_nodelay on; + proxy_set_header Host $http_host; } # xmpp websockets @@ -41,6 +44,15 @@ location = /xmpp-websocket { tcp_nodelay on; } +# colibri (JVB) websockets for jvb1 +location ~ ^/colibri-ws/default-id/(.*) { + proxy_pass http://127.0.0.1:9090/colibri-ws/default-id/$1$is_args$args; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + tcp_nodelay on; +} + location ~ ^/([^/?&:'"]+)$ { try_files $uri @root_path; } @@ -51,10 +63,10 @@ location @root_path { location ~ ^/([^/?&:'"]+)/config.js$ { - set $subdomain "$1."; - set $subdir "$1/"; - - alias /etc/__NAME__/meet/__DOMAIN__-config.js; + set $subdomain "$1."; + set $subdir "$1/"; + + alias /etc/__NAME__/meet/__DOMAIN__-config.js; } #Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to / diff --git a/scripts/install b/scripts/install index 4361fa2..7cfd14a 100644 --- a/scripts/install +++ b/scripts/install @@ -243,6 +243,10 @@ jitsi_videobridge_20_jvb_udp_buffers_conf="/etc/sysctl.d/20-jvb-udp-buffers.conf cp ../conf/jitsi-videobridge-20-jvb-udp-buffers.conf "$jitsi_videobridge_20_jvb_udp_buffers_conf" sysctl --system || true +jitsi_videobridge_jvb_conf="/etc/$app/videobridge/jvb.conf" +cp ../conf/jitsi-videobridge-jvb.conf "$jitsi_videobridge_jvb_conf" +ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$jitsi_videobridge_jvb_conf" + #================================================= # CONFIGURE JITSI-JICOFO #================================================= @@ -254,18 +258,22 @@ jitsi_jicofo_sip_communicator_conf="/etc/$app/jicofo/sip-communicator.properties cp ../conf/jitsi-jicofo-sip-communicator.properties "$jitsi_jicofo_sip_communicator_conf" ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$jitsi_jicofo_sip_communicator_conf" -jitsi_jicofo_conf="/etc/$app/jicofo/config" -cp ../conf/jitsi-jicofo.config "$jitsi_jicofo_conf" -ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$jitsi_jicofo_conf" -ynh_replace_string --match_string="__PORT_COMPONENT__" --replace_string="$port_component" --target_file="$jitsi_jicofo_conf" -ynh_replace_string --match_string="__FOCUS_SECRET__" --replace_string="$focus_secret" --target_file="$jitsi_jicofo_conf" -ynh_replace_string --match_string="__FOCUS_USER__" --replace_string="$focus_user" --target_file="$jitsi_jicofo_conf" -ynh_replace_string --match_string="__FOCUS_PASSWORD__" --replace_string="$focus_password" --target_file="$jitsi_jicofo_conf" -ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="$jitsi_jicofo_conf" +jitsi_jicofo_config="/etc/$app/jicofo/config" +cp ../conf/jitsi-jicofo.config "$jitsi_jicofo_config" +ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$jitsi_jicofo_config" +ynh_replace_string --match_string="__PORT_COMPONENT__" --replace_string="$port_component" --target_file="$jitsi_jicofo_config" +ynh_replace_string --match_string="__FOCUS_SECRET__" --replace_string="$focus_secret" --target_file="$jitsi_jicofo_config" +ynh_replace_string --match_string="__FOCUS_USER__" --replace_string="$focus_user" --target_file="$jitsi_jicofo_config" +ynh_replace_string --match_string="__FOCUS_PASSWORD__" --replace_string="$focus_password" --target_file="$jitsi_jicofo_config" +ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="$jitsi_jicofo_config" jitsi_jicofo_logging_conf="/etc/$app/jicofo/logging.properties" cp ../conf/jitsi-jicofo-logging.properties "$jitsi_jicofo_logging_conf" +jitsi_jicofo_conf="/etc/$app/jicofo/jicofo.conf" +cp ../conf/jitsi-jicofo-jicofo.conf "$jitsi_jicofo_conf" + + #================================================= # CONFIGURE JITSI-MEET #=================================================