diff --git a/conf/jicofo.src b/conf/jicofo.src index e033fc6..f12f2c7 100644 --- a/conf/jicofo.src +++ b/conf/jicofo.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://download.jitsi.org/stable/jicofo_1.0-541-1_all.deb -SOURCE_SUM=be1fd88c63de46e5a4a1a314934d0b3b11bf1634fd89c62494d30a25b55c8568 +SOURCE_URL=https://download.jitsi.org/stable/jicofo_1.0-544-1_all.deb +SOURCE_SUM=34944ee997551c6cee68bf5933c256e29eef77e3d884716a96e0d6ab9879baea SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=true diff --git a/conf/jitsi-meet-prosody.src b/conf/jitsi-meet-prosody.src index 41f75ff..3a09db0 100644 --- a/conf/jitsi-meet-prosody.src +++ b/conf/jitsi-meet-prosody.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://download.jitsi.org/stable/jitsi-meet-prosody_1.0.3969-1_all.deb -SOURCE_SUM=d5649beb69516f22122e5a40e1b50082559c23751ce982614f09509316bfb999 +SOURCE_URL=https://download.jitsi.org/stable/jitsi-meet-prosody_1.0.3992-1_all.deb +SOURCE_SUM=f7f539bec8b5ab00cb401ff4f50c54dda27df9c98012069e6d6c7ab2943ac3ac SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=true diff --git a/conf/jitsi-meet-web.src b/conf/jitsi-meet-web.src index bb72408..155b90a 100644 --- a/conf/jitsi-meet-web.src +++ b/conf/jitsi-meet-web.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://download.jitsi.org/stable/jitsi-meet-web_1.0.3969-1_all.deb -SOURCE_SUM=f034557b0b30b97544c271a383adb7fdc9f74e1c8ffebe4aac87c0b2460784ae +SOURCE_URL=https://download.jitsi.org/stable/jitsi-meet-web_1.0.3992-1_all.deb +SOURCE_SUM=e431e41c1b055ecd238506285204eaad615ffc4f7d2ef6bbd8ef1ae7016cd845 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=true diff --git a/conf/jitsi-videobridge.src b/conf/jitsi-videobridge.src index 90f539b..0bff989 100644 --- a/conf/jitsi-videobridge.src +++ b/conf/jitsi-videobridge.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://download.jitsi.org/stable/jitsi-videobridge2_2.1-164-gfdce823f-1_all.deb -SOURCE_SUM=6a04a11fec7bffc74124d53d6734e599853311692b541805094af3577e2c8c58 +SOURCE_URL=https://download.jitsi.org/stable/jitsi-videobridge2_2.1-169-ga28eb88e-1_all.deb +SOURCE_SUM=d8a091c000bbbd6ea3ea77ef6a54e63c04d3483169cadce6b0187e318b97c499 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=true diff --git a/conf/metronome.cfg.lua b/conf/metronome.cfg.lua index 293087b..f01c489 100644 --- a/conf/metronome.cfg.lua +++ b/conf/metronome.cfg.lua @@ -73,7 +73,7 @@ VirtualHost "auth.__DOMAIN__" hostname = "localhost", user = { basedn = "ou=users,dc=yunohost,dc=org", - filter = "(&(objectClass=posixAccount)(mail=*@auth.__DOMAIN__))", + filter = "(&(objectClass=posixAccount)(mail=*@auth.__DOMAIN__)(permission=cn=xmpp.main,ou=permission,dc=yunohost,dc=org))", usernamefield = "mail", namefield = "cn", }, diff --git a/manifest.json b/manifest.json index a1c83d6..d5e7784 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Video conferencing web application", "fr": "Application web de conférence vidéo" }, - "version": "1.0.3969~ynh1", + "version": "1.0.3992~ynh1", "url": "https://jitsi.org/Projects/JitMeet", "license": "Apache-2.0", "maintainer": { diff --git a/scripts/install b/scripts/install index e7c5e55..6834827 100644 --- a/scripts/install +++ b/scripts/install @@ -123,7 +123,22 @@ do popd mv "$final_path/${package}_temp/usr/share/${packages[$package]}/" "$final_path/${package}/" - ynh_secure_remove --file="$final_path/${package}_temp" + # ynh_secure_remove --file="$final_path/${package}_temp" +done + +# Adapt prosody module to metronome +for file in $final_path/jitsi-meet-prosody/*.lua +do + ynh_replace_string --match_string="prosody" --replace_string="metronome" --target_file="$file" + ynh_replace_string --match_string="Prosody" --replace_string="Metronome" --target_file="$file" +done + +for directory in $final_path/jitsi-meet-prosody/*/; do + for file in $directory/*.lua + do + ynh_replace_string --match_string="prosody" --replace_string="metronome" --target_file="$file" + ynh_replace_string --match_string="Prosody" --replace_string="Metronome" --target_file="$file" + done done #================================================= @@ -149,8 +164,6 @@ ynh_system_user_create --username=$app --home_dir=$final_path #================================================= ynh_print_info --message="Configuring metronome..." -# Adapt prosody module to metronome -ynh_replace_string --match_string="prosody" --replace_string="metronome" --target_file="$final_path/jitsi-meet-prosody/mod_muc_domain_mapper.lua" # Create focus user yunohost domain add auth.$domain diff --git a/scripts/upgrade b/scripts/upgrade index a497f30..c76cd4a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -142,6 +142,21 @@ then mv "$final_path/${package}_temp/usr/share/${packages[$package]}/" "$final_path/${package}/" ynh_secure_remove --file="$final_path/${package}_temp" done + + # Adapt prosody module to metronome + for file in $final_path/jitsi-meet-prosody/*.lua + do + ynh_replace_string --match_string="prosody" --replace_string="metronome" --target_file="$file" + ynh_replace_string --match_string="Prosody" --replace_string="Metronome" --target_file="$file" + done + + for directory in $final_path/jitsi-meet-prosody/*/; do + for file in $directory/*.lua + do + ynh_replace_string --match_string="prosody" --replace_string="metronome" --target_file="$file" + ynh_replace_string --match_string="Prosody" --replace_string="Metronome" --target_file="$file" + done + done fi #=================================================