YunoHost-Apps/jitsi_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/jitsi_ynh.git synced 2024-09-03 19:35:57 +02:00
Code Issues Activity Actions

Merge pull request #64 from YunoHost-Apps/testing

Browse source 
Few improvments
This commit is contained in:
yalh76 2022-02-15 19:44:55 +01:00 • committed by GitHub
commit ba635a58f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Jitsi Meet is a libre software (Apache) WebRTC JavaScript app that uses Jitsi Videobridge to provide high quality, secure, and scalable video conferences. Jitsi Meet is a libre software (Apache) WebRTC JavaScript app that uses Jitsi Videobridge to provide high quality, secure, and scalable video conferences.
**Shipped version:** 1.0.4466~ynh1 **Shipped version:** 1.0.4466~ynh2
**Demo:** https://meet.jit.si/ **Demo:** https://meet.jit.si/

2
README_fr.md
View file

@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Jitsi Meet est un logiciel libre (Apache) dont Jitsi Videobridge, avec WebRTC Javascript, propose des vidéos-conférences de haute qualité, sécurisées et évolutives. Jitsi Meet est un logiciel libre (Apache) dont Jitsi Videobridge, avec WebRTC Javascript, propose des vidéos-conférences de haute qualité, sécurisées et évolutives.
**Version incluse :** 1.0.4466~ynh1 **Version incluse :** 1.0.4466~ynh2
**Démo :** https://meet.jit.si/ **Démo :** https://meet.jit.si/

2
check_process
View file

@ -11,6 +11,8 @@
upgrade=1 upgrade=1
# 1.0.3729~ynh1 # 1.0.3729~ynh1
# upgrade=1 from_commit=7e81cff25dd5a85a5f9b97299b2dc251f2725d4b # upgrade=1 from_commit=7e81cff25dd5a85a5f9b97299b2dc251f2725d4b
# 1.0.4466~ynh1
upgrade=1 from_commit=f967b101803c49655e460bdb2c1b0fb73320d0e3
backup_restore=1 backup_restore=1
multi_instance=0 multi_instance=0
port_already_use=0 port_already_use=0

4
conf/jitsi-videobridge-sip-communicator.properties
View file

@ -8,3 +8,7 @@ org.jitsi.videobridge.xmpp.user.shard.USERNAME=__VIDEOBRIDGE_USER__
org.jitsi.videobridge.xmpp.user.shard.PASSWORD=__VIDEOBRIDGE_SECRET__ org.jitsi.videobridge.xmpp.user.shard.PASSWORD=__VIDEOBRIDGE_SECRET__
org.jitsi.videobridge.xmpp.user.shard.MUC_JIDS=JvbBrewery@internal.auth.__DOMAIN__ org.jitsi.videobridge.xmpp.user.shard.MUC_JIDS=JvbBrewery@internal.auth.__DOMAIN__
org.jitsi.videobridge.xmpp.user.shard.MUC_NICKNAME=__MUC_NICKNAME__ org.jitsi.videobridge.xmpp.user.shard.MUC_NICKNAME=__MUC_NICKNAME__
org.jitsi.videobridge.DISABLE_TCP_HARVESTER=false
org.jitsi.videobridge.TCP_HARVESTER_PORT=__PORT__
org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=__PRIVATE_IPV4__
org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=__PUBLIC_IPV4__

16
conf/nginx.conf
View file

@ -15,7 +15,7 @@ location = /external_api.js {
alias __FINALPATH__/jitsi-meet-web/libs/external_api.min.js; alias __FINALPATH__/jitsi-meet-web/libs/external_api.min.js;
} }
#ensure all static content can always be found first # ensure all static content can always be found first
location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|.well-known)/(.*)$ location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|.well-known)/(.*)$
{ {
more_set_headers "Access-Control-Allow-Origin: *"; more_set_headers "Access-Control-Allow-Origin: *";
@ -29,9 +29,9 @@ location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|.
# BOSH # BOSH
location = /http-bind { location = /http-bind {
proxy_pass http://127.0.0.1:5280/http-bind?prefix=$prefix&$args; proxy_pass http://127.0.0.1:5280/http-bind?prefix=$prefix&$args;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
} }
# xmpp websockets # xmpp websockets
@ -63,10 +63,10 @@ location @root_path {
location ~ ^/([^/?&:'"]+)/config.js$ location ~ ^/([^/?&:'"]+)/config.js$
{ {
set $subdomain "$1."; set $subdomain "$1.";
set $subdir "$1/"; set $subdir "$1/";
alias /etc/__NAME__/meet/__DOMAIN__-config.js; alias /etc/__NAME__/meet/__DOMAIN__-config.js;
} }
# BOSH for subdomains # BOSH for subdomains
@ -87,7 +87,7 @@ location ~ ^/([^/?&:'"]+)/xmpp-websocket {
rewrite ^/(.*)$ /xmpp-websocket; rewrite ^/(.*)$ /xmpp-websocket;
} }
#Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to / # Anything that didn't match above, and isn't a real file, assume it's a room name and redirect to /
location ~ ^/([^/?&:'"]+)/(.*)$ { location ~ ^/([^/?&:'"]+)/(.*)$ {
set $subdomain "$1."; set $subdomain "$1.";
set $subdir "$1/"; set $subdir "$1/";

4
conf/prosody.cfg.lua
View file

@ -108,6 +108,10 @@ Component "internal.auth.__DOMAIN__" "muc"
muc_room_default_public_jids = true muc_room_default_public_jids = true
VirtualHost "auth.__DOMAIN__" VirtualHost "auth.__DOMAIN__"
ssl = {
key = "/etc/prosody/certs/auth.__DOMAIN__.key";
certificate = "/etc/prosody/certs/auth.__DOMAIN__.crt";
}
modules_enabled = { modules_enabled = {
"limits_exception"; "limits_exception";
} }

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Video conferencing web application", "en": "Video conferencing web application",
"fr": "Application web de conférence vidéo" "fr": "Application web de conférence vidéo"
}, },
"version": "1.0.4466~ynh1", "version": "1.0.4466~ynh2",
"url": "https://jitsi.org/Projects/JitMeet", "url": "https://jitsi.org/Projects/JitMeet",
"upstream": { "upstream": {
"license": "Apache-2.0", "license": "Apache-2.0",

4
scripts/install
View file

@ -77,13 +77,13 @@ ynh_script_progression --message="Finding an available port..."
# Find an available port # Find an available port
port=4443 port=4443
# Open this port # Open this port
ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port ynh_exec_warn_less yunohost firewall allow TCP $port
ynh_app_setting_set --app=$app --key=port --value=$port ynh_app_setting_set --app=$app --key=port --value=$port
# Find an available port # Find an available port
port_videobridge=10000 port_videobridge=10000
# Open this port # Open this port
ynh_exec_warn_less yunohost firewall allow --no-upnp UDP $port_videobridge ynh_exec_warn_less yunohost firewall allow UDP $port_videobridge
ynh_app_setting_set --app=$app --key=port_videobridge --value=$port_videobridge ynh_app_setting_set --app=$app --key=port_videobridge --value=$port_videobridge
# Find an available port # Find an available port

4
scripts/restore
View file

@ -107,8 +107,8 @@ gpasswd --add prosody $app
ynh_script_progression --message="Configuring firewall..." ynh_script_progression --message="Configuring firewall..."
# Open this port # Open this port
ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port ynh_exec_warn_less yunohost firewall allow TCP $port
ynh_exec_warn_less yunohost firewall allow --no-upnp UDP $port_videobridge ynh_exec_warn_less yunohost firewall allow UDP $port_videobridge
#================================================= #=================================================
# CONFIGURE PROSODY # CONFIGURE PROSODY

9
scripts/upgrade
View file

@ -151,6 +151,15 @@ gpasswd --add prosody $app
#================================================= #=================================================
# SPECIFIC UPGRADE # SPECIFIC UPGRADE
#=================================================
# CONFIGURE FIREWALL
#=================================================
ynh_script_progression --message="Configuring firewall..."
# Open this port
ynh_exec_warn_less yunohost firewall allow TCP $port
ynh_exec_warn_less yunohost firewall allow UDP $port_videobridge
#================================================= #=================================================
# CONFIGURE PROSODY # CONFIGURE PROSODY
#================================================= #=================================================