From aa06cfa0a31fa2f4b9be4363869faa505e8b2c9d Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Tue, 12 Apr 2022 23:14:43 -0400 Subject: [PATCH 01/81] add install support for armv7l i can not test for armv7h --- scripts/install | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/scripts/install b/scripts/install index 102e153..794c083 100644 --- a/scripts/install +++ b/scripts/install @@ -126,6 +126,46 @@ gpasswd --add www-data $app #================================================= ynh_script_progression --message="Setting up source files..." +if [ $(uname -m) == "armv7l" ] +then + # prepare openjdk8 installation + mkdir /tmp/jitsi-install/ + cd /tmp/jitsi-install/ + + #install openjdk 8 because javah is used by jitsi and not supported in higher versions + wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jre_8u322-b06-1~deb9u1_armhf.deb + wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jre-headless_8u322-b06-1~deb9u1_armhf.deb + wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jdk_8u322-b06-1~deb9u1_armhf.deb + wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jdk-headless_8u322-b06-1~deb9u1_armhf.deb + + sudo apt install \ + ./openjdk-8-jre_8u322-b06-1~deb9u1_armhf.deb \ + ./openjdk-8-jre-headless_8u322-b06-1~deb9u1_armhf.deb \ + ./openjdk-8-jdk_8u322-b06-1~deb9u1_armhf.deb \ + ./openjdk-8-jdk-headless_8u322-b06-1~deb9u1_armhf.deb + + # ser openjdk as default + sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-armhf/jre/bin/java + + # stop related services if exist + sudo systemctl stop prosody jitsi-videobridge jitsi-jicofo + + # prepare jniwrapper comppilation + export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-armhf + sudo apt update + sudo apt install automake autoconf build-essential libtool git maven m4 + git clone https://github.com/sctplab/usrsctp.git + git clone https://github.com/jitsi/jitsi-sctp + mv ./usrsctp ./jitsi-sctp/usrsctp/ + cd ./jitsi-sctp + # needed to make compile works + mkdir -p ./jniwrapper/native/src/main/resources/lib/linux-arm/ + + # compile + mvn package -DbuildSctp -DbuildNativeWrapper -DdeployNewJnilib -DskipTests + mvn package +fi + ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src declare -A packages @@ -146,6 +186,15 @@ do ynh_secure_remove --file="$final_path/${package}_temp" done +if [ $(uname -m) == "armv7l" ] +then + # rm official jniwrapper to copy + rm "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-*" + cp "./jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-SNAPSHOT.jar" + chmod 640 jniwrapper-native-1.0-SNAPSHOT.jar + chown $app:$app jniwrapper-native-1.0-SNAPSHOT.jar +fi + ynh_setup_source --dest_dir="$final_path/jitsi-meet-prosody" --source_id=mod_auth_ldap chmod 750 "$final_path" From 7d90a3e3a42e66e1bcf03f8b25b5237f5cbe581b Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Tue, 12 Apr 2022 23:22:57 -0400 Subject: [PATCH 02/81] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 794c083..fb226ba 100644 --- a/scripts/install +++ b/scripts/install @@ -148,7 +148,7 @@ then sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-armhf/jre/bin/java # stop related services if exist - sudo systemctl stop prosody jitsi-videobridge jitsi-jicofo + #sudo systemctl stop prosody jitsi-videobridge jitsi-jicofo # prepare jniwrapper comppilation export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-armhf From 72d3e5bcdaccba06bf25592d1f9e767769361f9b Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Tue, 12 Apr 2022 23:39:34 -0400 Subject: [PATCH 03/81] Update install --- scripts/install | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index fb226ba..6e945a4 100644 --- a/scripts/install +++ b/scripts/install @@ -129,9 +129,12 @@ ynh_script_progression --message="Setting up source files..." if [ $(uname -m) == "armv7l" ] then # prepare openjdk8 installation - mkdir /tmp/jitsi-install/ - cd /tmp/jitsi-install/ + if [! -d "/tmp/jitsi-install/" ] + then + mkdir /tmp/jitsi-install/ + fi + cd /tmp/jitsi-install/ #install openjdk 8 because javah is used by jitsi and not supported in higher versions wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jre_8u322-b06-1~deb9u1_armhf.deb wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jre-headless_8u322-b06-1~deb9u1_armhf.deb @@ -190,9 +193,7 @@ if [ $(uname -m) == "armv7l" ] then # rm official jniwrapper to copy rm "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-*" - cp "./jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-SNAPSHOT.jar" - chmod 640 jniwrapper-native-1.0-SNAPSHOT.jar - chown $app:$app jniwrapper-native-1.0-SNAPSHOT.jar + cp "./jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" fi ynh_setup_source --dest_dir="$final_path/jitsi-meet-prosody" --source_id=mod_auth_ldap From 008c685512858233c4e3242b621fb035fe0a8e80 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Tue, 12 Apr 2022 23:55:39 -0400 Subject: [PATCH 04/81] Update install --- scripts/install | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/scripts/install b/scripts/install index 6e945a4..900e62d 100644 --- a/scripts/install +++ b/scripts/install @@ -42,7 +42,7 @@ focus_user="focus" videobridge_user="jvb" -max_memory=75 +max_memory=150 #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS @@ -156,7 +156,7 @@ then # prepare jniwrapper comppilation export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-armhf sudo apt update - sudo apt install automake autoconf build-essential libtool git maven m4 + sudo apt install automake autoconf build-essential libtool git maven m4 -y git clone https://github.com/sctplab/usrsctp.git git clone https://github.com/jitsi/jitsi-sctp mv ./usrsctp ./jitsi-sctp/usrsctp/ @@ -189,13 +189,6 @@ do ynh_secure_remove --file="$final_path/${package}_temp" done -if [ $(uname -m) == "armv7l" ] -then - # rm official jniwrapper to copy - rm "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-*" - cp "./jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" -fi - ynh_setup_source --dest_dir="$final_path/jitsi-meet-prosody" --source_id=mod_auth_ldap chmod 750 "$final_path" @@ -342,6 +335,16 @@ ynh_script_progression --message="Starting a systemd service..." ynh_systemd_action --service_name=$app-jicofo --action="start" --log_path="/var/log/$app/$app-jicofo.log" ynh_systemd_action --service_name=$app-videobridge --action="start" --log_path="/var/log/$app/$app-videobridge.log" +if [ $(uname -m) == "armv7l" ] +then + # rm official jniwrapper to copy + rm "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-*" + cp "./jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" +fi +# Start a systemd service +ynh_systemd_action --service_name=$app-jicofo --action="restart" --log_path="/var/log/$app/$app-jicofo.log" +ynh_systemd_action --service_name=$app-videobridge --action="restart" --log_path="/var/log/$app/$app-videobridge.log" + #================================================= # SETUP SSOWAT #================================================= From e8b7daae0ce2022f0869fea005255ca370884a20 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Tue, 12 Apr 2022 23:58:42 -0400 Subject: [PATCH 05/81] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 900e62d..07080bf 100644 --- a/scripts/install +++ b/scripts/install @@ -339,7 +339,7 @@ if [ $(uname -m) == "armv7l" ] then # rm official jniwrapper to copy rm "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-*" - cp "./jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" + cp "/tmp/jitsi-install/jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" fi # Start a systemd service ynh_systemd_action --service_name=$app-jicofo --action="restart" --log_path="/var/log/$app/$app-jicofo.log" From 9661da27b78e16b9f1a3a35772e6f3b78ab413b4 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 00:02:05 -0400 Subject: [PATCH 06/81] Update install --- scripts/install | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 07080bf..29c7c14 100644 --- a/scripts/install +++ b/scripts/install @@ -159,10 +159,17 @@ then sudo apt install automake autoconf build-essential libtool git maven m4 -y git clone https://github.com/sctplab/usrsctp.git git clone https://github.com/jitsi/jitsi-sctp - mv ./usrsctp ./jitsi-sctp/usrsctp/ + + if [! -d "/tmp/jitsi-install/jitsi-sctp/usrsctp/" ] + then + mv ./usrsctp ./jitsi-sctp/usrsctp/ + fi cd ./jitsi-sctp # needed to make compile works - mkdir -p ./jniwrapper/native/src/main/resources/lib/linux-arm/ + if [! -d "/tmp/jitsi-install/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/" ] + then + mkdir -p ./jniwrapper/native/src/main/resources/lib/linux-arm/ + fi # compile mvn package -DbuildSctp -DbuildNativeWrapper -DdeployNewJnilib -DskipTests From 43381e2ec98981379a91f1c716eee276e836ade2 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 00:04:36 -0400 Subject: [PATCH 07/81] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 29c7c14..7ee26fb 100644 --- a/scripts/install +++ b/scripts/install @@ -42,7 +42,7 @@ focus_user="focus" videobridge_user="jvb" -max_memory=150 +max_memory=200 #125 mib with no user +1,5*50 users=75 mib #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS From c6a5d5b589d2ab1560b78009b70e51f47dcce8c2 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 00:11:38 -0400 Subject: [PATCH 08/81] Update install --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 7ee26fb..e135380 100644 --- a/scripts/install +++ b/scripts/install @@ -129,7 +129,7 @@ ynh_script_progression --message="Setting up source files..." if [ $(uname -m) == "armv7l" ] then # prepare openjdk8 installation - if [! -d "/tmp/jitsi-install/" ] + if ! -d "/tmp/jitsi-install/" then mkdir /tmp/jitsi-install/ fi @@ -160,13 +160,13 @@ then git clone https://github.com/sctplab/usrsctp.git git clone https://github.com/jitsi/jitsi-sctp - if [! -d "/tmp/jitsi-install/jitsi-sctp/usrsctp/" ] + if ! -d "/tmp/jitsi-install/jitsi-sctp/usrsctp/" then mv ./usrsctp ./jitsi-sctp/usrsctp/ fi cd ./jitsi-sctp # needed to make compile works - if [! -d "/tmp/jitsi-install/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/" ] + if ! -d "/tmp/jitsi-install/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/" then mkdir -p ./jniwrapper/native/src/main/resources/lib/linux-arm/ fi From 3a80dd4ded5a2a6a7b3e538b5abdad33b28b5d1a Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 00:15:44 -0400 Subject: [PATCH 09/81] Update install --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index e135380..6e0757f 100644 --- a/scripts/install +++ b/scripts/install @@ -129,7 +129,7 @@ ynh_script_progression --message="Setting up source files..." if [ $(uname -m) == "armv7l" ] then # prepare openjdk8 installation - if ! -d "/tmp/jitsi-install/" + if [ ! -d "/tmp/jitsi-install/" ] then mkdir /tmp/jitsi-install/ fi @@ -160,13 +160,13 @@ then git clone https://github.com/sctplab/usrsctp.git git clone https://github.com/jitsi/jitsi-sctp - if ! -d "/tmp/jitsi-install/jitsi-sctp/usrsctp/" + if [ ! -d "/tmp/jitsi-install/jitsi-sctp/usrsctp/" ] then mv ./usrsctp ./jitsi-sctp/usrsctp/ fi cd ./jitsi-sctp # needed to make compile works - if ! -d "/tmp/jitsi-install/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/" + if [ ! -d "/tmp/jitsi-install/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/" ] then mkdir -p ./jniwrapper/native/src/main/resources/lib/linux-arm/ fi From 35d24c4710ba828dc643c50e609727c76999fd4e Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 00:28:23 -0400 Subject: [PATCH 10/81] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 6e0757f..ce7ed7b 100644 --- a/scripts/install +++ b/scripts/install @@ -345,7 +345,7 @@ ynh_systemd_action --service_name=$app-videobridge --action="start" --log_path=" if [ $(uname -m) == "armv7l" ] then # rm official jniwrapper to copy - rm "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-*" + rm "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-8-g04269a7.jar" cp "/tmp/jitsi-install/jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" fi # Start a systemd service From 7f89437bc809f3a6accd4905468ec6a659ed64eb Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 00:32:31 -0400 Subject: [PATCH 11/81] Update install --- scripts/install | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index ce7ed7b..d7ee161 100644 --- a/scripts/install +++ b/scripts/install @@ -129,11 +129,12 @@ ynh_script_progression --message="Setting up source files..." if [ $(uname -m) == "armv7l" ] then # prepare openjdk8 installation - if [ ! -d "/tmp/jitsi-install/" ] + if [ -d "/tmp/jitsi-install/" ] then - mkdir /tmp/jitsi-install/ + rm -rf /tmp/jitsi-install/ fi + mkdir /tmp/jitsi-install/ cd /tmp/jitsi-install/ #install openjdk 8 because javah is used by jitsi and not supported in higher versions wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jre_8u322-b06-1~deb9u1_armhf.deb From 1e099cbe2daff157dcbecc2f57a87cf3d62b4892 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 00:39:13 -0400 Subject: [PATCH 12/81] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index d7ee161..5984fdd 100644 --- a/scripts/install +++ b/scripts/install @@ -163,7 +163,7 @@ then if [ ! -d "/tmp/jitsi-install/jitsi-sctp/usrsctp/" ] then - mv ./usrsctp ./jitsi-sctp/usrsctp/ + mv ./usrsctp ./jitsi-sctp/ fi cd ./jitsi-sctp # needed to make compile works From 74df4200c51a5545048ce9a7d2d23eb47afeec92 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 00:51:36 -0400 Subject: [PATCH 13/81] Update install --- scripts/install | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/scripts/install b/scripts/install index 5984fdd..c46ffd5 100644 --- a/scripts/install +++ b/scripts/install @@ -135,18 +135,17 @@ then fi mkdir /tmp/jitsi-install/ - cd /tmp/jitsi-install/ #install openjdk 8 because javah is used by jitsi and not supported in higher versions - wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jre_8u322-b06-1~deb9u1_armhf.deb - wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jre-headless_8u322-b06-1~deb9u1_armhf.deb - wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jdk_8u322-b06-1~deb9u1_armhf.deb - wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jdk-headless_8u322-b06-1~deb9u1_armhf.deb + wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jre_8u322-b06-1~deb9u1_armhf.deb -P /tmp/jitsi-install/ + wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jre-headless_8u322-b06-1~deb9u1_armhf.deb -P /tmp/jitsi-install/ + wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jdk_8u322-b06-1~deb9u1_armhf.deb -P /tmp/jitsi-install/ + wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jdk-headless_8u322-b06-1~deb9u1_armhf.deb -P /tmp/jitsi-install/ sudo apt install \ - ./openjdk-8-jre_8u322-b06-1~deb9u1_armhf.deb \ - ./openjdk-8-jre-headless_8u322-b06-1~deb9u1_armhf.deb \ - ./openjdk-8-jdk_8u322-b06-1~deb9u1_armhf.deb \ - ./openjdk-8-jdk-headless_8u322-b06-1~deb9u1_armhf.deb + /tmp/jitsi-install/openjdk-8-jre_8u322-b06-1~deb9u1_armhf.deb \ + /tmp/jitsi-install/openjdk-8-jre-headless_8u322-b06-1~deb9u1_armhf.deb \ + /tmp/jitsi-install/openjdk-8-jdk_8u322-b06-1~deb9u1_armhf.deb \ + /tmp/jitsi-install/openjdk-8-jdk-headless_8u322-b06-1~deb9u1_armhf.deb # ser openjdk as default sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-armhf/jre/bin/java @@ -158,18 +157,17 @@ then export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-armhf sudo apt update sudo apt install automake autoconf build-essential libtool git maven m4 -y - git clone https://github.com/sctplab/usrsctp.git - git clone https://github.com/jitsi/jitsi-sctp + git clone https://github.com/sctplab/usrsctp.git /tmp/jitsi-install/ + git clone https://github.com/jitsi/jitsi-sctp /tmp/jitsi-install/ if [ ! -d "/tmp/jitsi-install/jitsi-sctp/usrsctp/" ] then - mv ./usrsctp ./jitsi-sctp/ + mv /tmp/jitsi-install/usrsctp /tmp/jitsi-install/jitsi-sctp/ fi - cd ./jitsi-sctp # needed to make compile works if [ ! -d "/tmp/jitsi-install/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/" ] then - mkdir -p ./jniwrapper/native/src/main/resources/lib/linux-arm/ + mkdir -p /tmp/jitsi-install/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/ fi # compile From ad4eb05bf042da5880bd53dc68a776f1d268a39e Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 00:55:38 -0400 Subject: [PATCH 14/81] Update install --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index c46ffd5..408baf6 100644 --- a/scripts/install +++ b/scripts/install @@ -129,9 +129,9 @@ ynh_script_progression --message="Setting up source files..." if [ $(uname -m) == "armv7l" ] then # prepare openjdk8 installation - if [ -d "/tmp/jitsi-install/" ] + if [ -d "/tmp/jitsi-install" ] then - rm -rf /tmp/jitsi-install/ + rm -rf /tmp/jitsi-install fi mkdir /tmp/jitsi-install/ From 45a22c72d3dd299091f9b771fdee9f25771c3c08 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 01:07:13 -0400 Subject: [PATCH 15/81] Update install --- scripts/install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 408baf6..83fa7c0 100644 --- a/scripts/install +++ b/scripts/install @@ -129,9 +129,9 @@ ynh_script_progression --message="Setting up source files..." if [ $(uname -m) == "armv7l" ] then # prepare openjdk8 installation - if [ -d "/tmp/jitsi-install" ] + if [ -d "/tmp/jitsi-install/" ] then - rm -rf /tmp/jitsi-install + rm -rf /tmp/jitsi-install/ fi mkdir /tmp/jitsi-install/ @@ -157,8 +157,8 @@ then export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-armhf sudo apt update sudo apt install automake autoconf build-essential libtool git maven m4 -y - git clone https://github.com/sctplab/usrsctp.git /tmp/jitsi-install/ - git clone https://github.com/jitsi/jitsi-sctp /tmp/jitsi-install/ + git clone https://github.com/sctplab/usrsctp /tmp/jitsi-install/usrsctp + git clone https://github.com/jitsi/jitsi-sctp /tmp/jitsi-install/jitsi-sctp if [ ! -d "/tmp/jitsi-install/jitsi-sctp/usrsctp/" ] then From 194f71e818c24193db77e9e231e786f8b8dd42a4 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 01:16:12 -0400 Subject: [PATCH 16/81] Update install --- scripts/install | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/install b/scripts/install index 83fa7c0..27de8a1 100644 --- a/scripts/install +++ b/scripts/install @@ -44,6 +44,8 @@ videobridge_user="jvb" max_memory=200 #125 mib with no user +1,5*50 users=75 mib +scriptpath=$(pwd) + #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= @@ -171,8 +173,10 @@ then fi # compile + cd /tmp/jitsi-install/jitsi-sctp mvn package -DbuildSctp -DbuildNativeWrapper -DdeployNewJnilib -DskipTests mvn package + cd $scriptpath fi ynh_app_setting_set --app=$app --key=final_path --value=$final_path From 390dcb344de8cff7b32bf7bd4bb8142fdb851495 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 01:26:00 -0400 Subject: [PATCH 17/81] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 27de8a1..e2c2e04 100644 --- a/scripts/install +++ b/scripts/install @@ -164,7 +164,7 @@ then if [ ! -d "/tmp/jitsi-install/jitsi-sctp/usrsctp/" ] then - mv /tmp/jitsi-install/usrsctp /tmp/jitsi-install/jitsi-sctp/ + cp /tmp/jitsi-install/usrsctp /tmp/jitsi-install/jitsi-sctp/ fi # needed to make compile works if [ ! -d "/tmp/jitsi-install/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/" ] From a686077f4389eb2c302dd4d3174c297241e5e0f0 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 01:33:26 -0400 Subject: [PATCH 18/81] Update install --- scripts/install | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index e2c2e04..3746398 100644 --- a/scripts/install +++ b/scripts/install @@ -161,11 +161,8 @@ then sudo apt install automake autoconf build-essential libtool git maven m4 -y git clone https://github.com/sctplab/usrsctp /tmp/jitsi-install/usrsctp git clone https://github.com/jitsi/jitsi-sctp /tmp/jitsi-install/jitsi-sctp + cp /tmp/jitsi-install/usrsctp /tmp/jitsi-install/jitsi-sctp/ - if [ ! -d "/tmp/jitsi-install/jitsi-sctp/usrsctp/" ] - then - cp /tmp/jitsi-install/usrsctp /tmp/jitsi-install/jitsi-sctp/ - fi # needed to make compile works if [ ! -d "/tmp/jitsi-install/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/" ] then From 6470b2e1b0399205aac9dc5338990eda1c7ab355 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 01:37:07 -0400 Subject: [PATCH 19/81] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 3746398..0119c75 100644 --- a/scripts/install +++ b/scripts/install @@ -161,7 +161,7 @@ then sudo apt install automake autoconf build-essential libtool git maven m4 -y git clone https://github.com/sctplab/usrsctp /tmp/jitsi-install/usrsctp git clone https://github.com/jitsi/jitsi-sctp /tmp/jitsi-install/jitsi-sctp - cp /tmp/jitsi-install/usrsctp /tmp/jitsi-install/jitsi-sctp/ + mv /tmp/jitsi-install/usrsctp /tmp/jitsi-install/jitsi-sctp/ # needed to make compile works if [ ! -d "/tmp/jitsi-install/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/" ] From 568ba52f3c4f0bd3fe4d4605dc173fc792281f76 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 01:39:25 -0400 Subject: [PATCH 20/81] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 0119c75..85348ae 100644 --- a/scripts/install +++ b/scripts/install @@ -161,7 +161,7 @@ then sudo apt install automake autoconf build-essential libtool git maven m4 -y git clone https://github.com/sctplab/usrsctp /tmp/jitsi-install/usrsctp git clone https://github.com/jitsi/jitsi-sctp /tmp/jitsi-install/jitsi-sctp - mv /tmp/jitsi-install/usrsctp /tmp/jitsi-install/jitsi-sctp/ + mv /tmp/jitsi-install/usrsctp /tmp/jitsi-install/jitsi-sctp/usrscto/ # needed to make compile works if [ ! -d "/tmp/jitsi-install/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/" ] From 15d63dcc0a1a10fec36dee4edccefdfbece13109 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 08:29:44 -0400 Subject: [PATCH 21/81] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 85348ae..8bd6571 100644 --- a/scripts/install +++ b/scripts/install @@ -161,7 +161,7 @@ then sudo apt install automake autoconf build-essential libtool git maven m4 -y git clone https://github.com/sctplab/usrsctp /tmp/jitsi-install/usrsctp git clone https://github.com/jitsi/jitsi-sctp /tmp/jitsi-install/jitsi-sctp - mv /tmp/jitsi-install/usrsctp /tmp/jitsi-install/jitsi-sctp/usrscto/ + mv /tmp/jitsi-install/usrsctp /tmp/jitsi-install/jitsi-sctp/usrsctp/ # needed to make compile works if [ ! -d "/tmp/jitsi-install/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/" ] From def52223c311fd5a452b55c2d6c08fcd37fb061b Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 08:49:44 -0400 Subject: [PATCH 22/81] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 8bd6571..5b8e9ea 100644 --- a/scripts/install +++ b/scripts/install @@ -346,7 +346,7 @@ if [ $(uname -m) == "armv7l" ] then # rm official jniwrapper to copy rm "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-8-g04269a7.jar" - cp "/tmp/jitsi-install/jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" + cp "/tmp/jitsi-install/jitsi-sctp/jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" fi # Start a systemd service ynh_systemd_action --service_name=$app-jicofo --action="restart" --log_path="/var/log/$app/$app-jicofo.log" From 02313631fc53f83cfa7088274cc3086d60a1108f Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 18:50:49 -0400 Subject: [PATCH 23/81] Update _common.sh --- scripts/_common.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index 45d1c9f..549ec30 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,6 +6,7 @@ # dependencies used by the app pkg_dependencies="openjdk-8-jre-headless|openjdk-11-jre-headless debconf|debconf-2.0 procps uuid-runtime lua-ldap" +pkg_extra_dependencies_arm="openjdk-8-jre_*_armhf.deb openjdk-8-jre-headless_*_armhf.deb openjdk-8-jdf_*_armhf.deb openjdk-8-jdk-headless_*_armhf.deb" #================================================= # PERSONAL HELPERS From 33722d533f4f896d3563313e50f52b46920325cf Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 18:57:04 -0400 Subject: [PATCH 24/81] Update _common.sh --- scripts/_common.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 549ec30..e4d27c5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,10 @@ # dependencies used by the app pkg_dependencies="openjdk-8-jre-headless|openjdk-11-jre-headless debconf|debconf-2.0 procps uuid-runtime lua-ldap" -pkg_extra_dependencies_arm="openjdk-8-jre_*_armhf.deb openjdk-8-jre-headless_*_armhf.deb openjdk-8-jdf_*_armhf.deb openjdk-8-jdk-headless_*_armhf.deb" +pkg_extra_dependencies_arm="openjdk-8-jre_8u322-b06-1~deb9u1_armhf.deb \ + openjdk-8-jre-headless_8u322-b06-1~deb9u1_armhf.deb \ + openjdk-8-jdf_8u322-b06-1~deb9u1_armhf.deb \ + openjdk-8-jdk-headless_8u322-b06-1~deb9u1_armhf.deb" #================================================= # PERSONAL HELPERS From b4b5aa550973a8713400122dc1cba63aeddec442 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 19:18:10 -0400 Subject: [PATCH 25/81] Update _common.sh --- scripts/_common.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index e4d27c5..6179405 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,6 +6,7 @@ # dependencies used by the app pkg_dependencies="openjdk-8-jre-headless|openjdk-11-jre-headless debconf|debconf-2.0 procps uuid-runtime lua-ldap" +pkg_dependencies_arm="automake autoconf build-essential libtool git maven m4" pkg_extra_dependencies_arm="openjdk-8-jre_8u322-b06-1~deb9u1_armhf.deb \ openjdk-8-jre-headless_8u322-b06-1~deb9u1_armhf.deb \ openjdk-8-jdf_8u322-b06-1~deb9u1_armhf.deb \ From 908ef0bffe525ea1e7b091579ef3a8db379c0166 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 19:43:32 -0400 Subject: [PATCH 26/81] create file --- conf/usrsctp.src | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 conf/usrsctp.src diff --git a/conf/usrsctp.src b/conf/usrsctp.src new file mode 100644 index 0000000..3ecdfb7 --- /dev/null +++ b/conf/usrsctp.src @@ -0,0 +1,7 @@ +SOURCE_URL=https://github.com/sctplab/usrsctp.git +SOURCE_SUM=6ed4f76bbe9dfe4d4e6508d48e8337c2867dce8ec3de50b3b03fc60bfae8aaa4 +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=deb +SOURCE_IN_SUBDIR=true +SOURCE_FILENAME=jitsi-meet-prosody.deb +SOURCE_EXTRACT=false From c5aef465b7933f9ca1b6a69f0f25ce864debe077 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 21:49:01 -0400 Subject: [PATCH 27/81] intermediate update --- scripts/install | 108 +++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 60 deletions(-) diff --git a/scripts/install b/scripts/install index 5b8e9ea..46e3df8 100644 --- a/scripts/install +++ b/scripts/install @@ -100,8 +100,19 @@ ynh_app_setting_set --app=$app --key=port_component --value=$port_component #================================================= ynh_script_progression --message="Installing dependencies..." +ynh_package_update +# install generic dependencies ynh_install_app_dependencies $pkg_dependencies +if [ $(uname -m) == "armv7l" ] +then + # install arm specific depedencies to compile extra dependencies + ynh_install_app_dependencies $pkg_dependencies_arm + + # install extra dependencies not present in default debian repositories + ynh_install_extra_app_dependencies --repo="http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/" --package="$pkg_extra_dependencies_arm" --key="https://ftp-master.debian.org/keys/archive-key-9-security.asc" +fi + if ! yunohost app list | grep -q "prosody" then yunohost tools update @@ -128,54 +139,6 @@ gpasswd --add www-data $app #================================================= ynh_script_progression --message="Setting up source files..." -if [ $(uname -m) == "armv7l" ] -then - # prepare openjdk8 installation - if [ -d "/tmp/jitsi-install/" ] - then - rm -rf /tmp/jitsi-install/ - fi - - mkdir /tmp/jitsi-install/ - #install openjdk 8 because javah is used by jitsi and not supported in higher versions - wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jre_8u322-b06-1~deb9u1_armhf.deb -P /tmp/jitsi-install/ - wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jre-headless_8u322-b06-1~deb9u1_armhf.deb -P /tmp/jitsi-install/ - wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jdk_8u322-b06-1~deb9u1_armhf.deb -P /tmp/jitsi-install/ - wget http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/openjdk-8-jdk-headless_8u322-b06-1~deb9u1_armhf.deb -P /tmp/jitsi-install/ - - sudo apt install \ - /tmp/jitsi-install/openjdk-8-jre_8u322-b06-1~deb9u1_armhf.deb \ - /tmp/jitsi-install/openjdk-8-jre-headless_8u322-b06-1~deb9u1_armhf.deb \ - /tmp/jitsi-install/openjdk-8-jdk_8u322-b06-1~deb9u1_armhf.deb \ - /tmp/jitsi-install/openjdk-8-jdk-headless_8u322-b06-1~deb9u1_armhf.deb - - # ser openjdk as default - sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-armhf/jre/bin/java - - # stop related services if exist - #sudo systemctl stop prosody jitsi-videobridge jitsi-jicofo - - # prepare jniwrapper comppilation - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-armhf - sudo apt update - sudo apt install automake autoconf build-essential libtool git maven m4 -y - git clone https://github.com/sctplab/usrsctp /tmp/jitsi-install/usrsctp - git clone https://github.com/jitsi/jitsi-sctp /tmp/jitsi-install/jitsi-sctp - mv /tmp/jitsi-install/usrsctp /tmp/jitsi-install/jitsi-sctp/usrsctp/ - - # needed to make compile works - if [ ! -d "/tmp/jitsi-install/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/" ] - then - mkdir -p /tmp/jitsi-install/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/ - fi - - # compile - cd /tmp/jitsi-install/jitsi-sctp - mvn package -DbuildSctp -DbuildNativeWrapper -DdeployNewJnilib -DskipTests - mvn package - cd $scriptpath -fi - ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src declare -A packages @@ -264,6 +227,43 @@ ynh_add_config --template="../conf/jitsi-videobridge-sip-communicator.properties ynh_add_config --template="../conf/jitsi-videobridge.config" --destination="/etc/$app/videobridge/config" +#================================================= +# REPLACE JNIWRAPPER FOR ARMV7L AARCHITECTURE +#================================================= +if [ $(uname -m) == "armv7l" ] +then + # set openjdk-8 as default + sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-armhf/jre/bin/java + tempdir="$(mktemp -d)" + + # prepare jniwrapper compilation + export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-armhf + + git clone https://github.com/sctplab/usrsctp $tempdir/usrsctp + git clone https://github.com/jitsi/jitsi-sctp $tempdir/jitsi-sctp + mv $tempdir/usrsctp $tempdir/jitsi-sctp/usrsctp/ + + # needed to make compile works + if [ ! -d "$tempdir/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/" ] + then + mkdir -p $tempdir/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/ + fi + + # compile + cd $tempdir/jitsi-sctp + mvn package -DbuildSctp -DbuildNativeWrapper -DdeployNewJnilib -DskipTests + mvn package + cd $scriptpath + + # rm official jniwrapper to copy + rm "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-8-g04269a7.jar" + cp "$tempdir/jitsi-sctp/jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" + + ynh_secure_remove --file="$tempdir" + +fi + + #================================================= # CONFIGURE JITSI-JICOFO #================================================= @@ -315,8 +315,6 @@ ynh_script_progression --message="Securing files and directories..." # Set permissions to app files chown -R $app: /etc/$app -#================================================= -# GENERIC FINALIZATION #================================================= # SETUP LOGROTATE #================================================= @@ -342,16 +340,6 @@ ynh_script_progression --message="Starting a systemd service..." ynh_systemd_action --service_name=$app-jicofo --action="start" --log_path="/var/log/$app/$app-jicofo.log" ynh_systemd_action --service_name=$app-videobridge --action="start" --log_path="/var/log/$app/$app-videobridge.log" -if [ $(uname -m) == "armv7l" ] -then - # rm official jniwrapper to copy - rm "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-8-g04269a7.jar" - cp "/tmp/jitsi-install/jitsi-sctp/jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" -fi -# Start a systemd service -ynh_systemd_action --service_name=$app-jicofo --action="restart" --log_path="/var/log/$app/$app-jicofo.log" -ynh_systemd_action --service_name=$app-videobridge --action="restart" --log_path="/var/log/$app/$app-videobridge.log" - #================================================= # SETUP SSOWAT #================================================= From 942e4a85051b00a1f533596ba940229ac6945d9e Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 21:50:39 -0400 Subject: [PATCH 28/81] file creation --- conf/jitsi-sctp.src | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 conf/jitsi-sctp.src diff --git a/conf/jitsi-sctp.src b/conf/jitsi-sctp.src new file mode 100644 index 0000000..a536ea9 --- /dev/null +++ b/conf/jitsi-sctp.src @@ -0,0 +1,7 @@ +SOURCE_URL=https://github.com/jitsi/jitsi-sctp +SOURCE_SUM=6ed4f76bbe9dfe4d4e6508d48e8337c2867dce8ec3de50b3b03fc60bfae8aaa4 +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=deb +SOURCE_IN_SUBDIR=true +SOURCE_FILENAME=jitsi-meet-prosody.deb +SOURCE_EXTRACT=false From 0415ee8ac2ed4ec343a30f3d429f47172b19ceed Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 22:16:11 -0400 Subject: [PATCH 29/81] Update usrsctp.src --- conf/usrsctp.src | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/usrsctp.src b/conf/usrsctp.src index 3ecdfb7..4632bbd 100644 --- a/conf/usrsctp.src +++ b/conf/usrsctp.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/sctplab/usrsctp.git -SOURCE_SUM=6ed4f76bbe9dfe4d4e6508d48e8337c2867dce8ec3de50b3b03fc60bfae8aaa4 +SOURCE_URL=https://github.com/sctplab/usrsctp/archive/refs/heads/master.zip +SOURCE_SUM=1daee6f1a7b81478ac4d1e154f5cfdc3d35f45515dca3e1d6941d8d570cf95a1 SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=deb +SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=jitsi-meet-prosody.deb -SOURCE_EXTRACT=false +SOURCE_FILENAME=usrsctp-master.zip +SOURCE_EXTRACT=true From 5b79acd717d22ff51dd08e6bf1b4b1826fd391a2 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 22:18:21 -0400 Subject: [PATCH 30/81] Update jitsi-sctp.src --- conf/jitsi-sctp.src | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/jitsi-sctp.src b/conf/jitsi-sctp.src index a536ea9..ebded67 100644 --- a/conf/jitsi-sctp.src +++ b/conf/jitsi-sctp.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/jitsi/jitsi-sctp -SOURCE_SUM=6ed4f76bbe9dfe4d4e6508d48e8337c2867dce8ec3de50b3b03fc60bfae8aaa4 +SOURCE_URL=https://github.com/jitsi/jitsi-sctp/archive/refs/heads/master.zip +SOURCE_SUM=c83829a9a9a5acc2cec156086824cf9709e04e8f6693ad19a43316bcee52fad5 SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=deb +SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=jitsi-meet-prosody.deb -SOURCE_EXTRACT=false +SOURCE_FILENAME=jitsi-sctp-master.zip +SOURCE_EXTRACT=true From c472a10b8d6834c8c20ad1de080cf99a9ffd5839 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 22:30:39 -0400 Subject: [PATCH 31/81] Update install --- scripts/install | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/scripts/install b/scripts/install index 46e3df8..41f96d2 100644 --- a/scripts/install +++ b/scripts/install @@ -239,9 +239,14 @@ then # prepare jniwrapper compilation export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-armhf - git clone https://github.com/sctplab/usrsctp $tempdir/usrsctp - git clone https://github.com/jitsi/jitsi-sctp $tempdir/jitsi-sctp - mv $tempdir/usrsctp $tempdir/jitsi-sctp/usrsctp/ + declare -A packages_arm + packages_arm[jitsi-sctp]="jitsi-sctp" + packages_arm[usrsctp]="jitsi-sctp/usrsctp" + + for packages_arm in "${!packages_arm[@]}" + do + ynh_setup_source --dest_dir="$tempdir" --source_id=$packages_arm + done # needed to make compile works if [ ! -d "$tempdir/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/" ] @@ -249,15 +254,14 @@ then mkdir -p $tempdir/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/ fi - # compile - cd $tempdir/jitsi-sctp - mvn package -DbuildSctp -DbuildNativeWrapper -DdeployNewJnilib -DskipTests - mvn package - cd $scriptpath - + pushd "$tempdir/jitsi-sctp" + mvn package -DbuildSctp -DbuildNativeWrapper -DdeployNewJnilib -DskipTests + mvn package + popd + # rm official jniwrapper to copy rm "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-8-g04269a7.jar" - cp "$tempdir/jitsi-sctp/jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" + mv "$tempdir/jitsi-sctp/jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" ynh_secure_remove --file="$tempdir" From a9b9997c6e5d8a734bd36081487023c6a7d1dea3 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Wed, 13 Apr 2022 22:39:32 -0400 Subject: [PATCH 32/81] Update install --- scripts/install | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/install b/scripts/install index 41f96d2..3844bf9 100644 --- a/scripts/install +++ b/scripts/install @@ -44,8 +44,6 @@ videobridge_user="jvb" max_memory=200 #125 mib with no user +1,5*50 users=75 mib -scriptpath=$(pwd) - #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= From d79d8c285a34c24ea5342d4522615e57555e2d8c Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 14:05:52 -0400 Subject: [PATCH 33/81] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 3844bf9..8359b34 100644 --- a/scripts/install +++ b/scripts/install @@ -108,7 +108,7 @@ then ynh_install_app_dependencies $pkg_dependencies_arm # install extra dependencies not present in default debian repositories - ynh_install_extra_app_dependencies --repo="http://security.debian.org/debian-security/pool/updates/main/o/openjdk-8/" --package="$pkg_extra_dependencies_arm" --key="https://ftp-master.debian.org/keys/archive-key-9-security.asc" + ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security/ $(lsb_release -cs)/update main" --package="$pkg_extra_dependencies_arm" fi if ! yunohost app list | grep -q "prosody" From 0ff01a58da3ecdf5206555fe2bc9b00793fe026e Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 14:09:11 -0400 Subject: [PATCH 34/81] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 8359b34..172a7ce 100644 --- a/scripts/install +++ b/scripts/install @@ -108,7 +108,7 @@ then ynh_install_app_dependencies $pkg_dependencies_arm # install extra dependencies not present in default debian repositories - ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security/ $(lsb_release -cs)/update main" --package="$pkg_extra_dependencies_arm" + ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security/ $(lsb_release -cs)/updates main" --package="$pkg_extra_dependencies_arm" fi if ! yunohost app list | grep -q "prosody" From e3496b7c9135e85e0ed7eab8793d41517403f0ac Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 14:09:40 -0400 Subject: [PATCH 35/81] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 172a7ce..6643a6f 100644 --- a/scripts/install +++ b/scripts/install @@ -108,7 +108,7 @@ then ynh_install_app_dependencies $pkg_dependencies_arm # install extra dependencies not present in default debian repositories - ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security/ $(lsb_release -cs)/updates main" --package="$pkg_extra_dependencies_arm" + ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security/ $(lsb_release -cs)/updates main" --package="$pkg_extra_dependencies_arm" fi if ! yunohost app list | grep -q "prosody" From ce64f60daf072b4cee369ddc3142661dcb5f56e1 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 14:24:19 -0400 Subject: [PATCH 36/81] Update jitsi-sctp.src --- conf/jitsi-sctp.src | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/conf/jitsi-sctp.src b/conf/jitsi-sctp.src index ebded67..e0cc99b 100644 --- a/conf/jitsi-sctp.src +++ b/conf/jitsi-sctp.src @@ -1,7 +1,6 @@ -SOURCE_URL=https://github.com/jitsi/jitsi-sctp/archive/refs/heads/master.zip -SOURCE_SUM=c83829a9a9a5acc2cec156086824cf9709e04e8f6693ad19a43316bcee52fad5 +SOURCE_URL=https://github.com/jitsi/jitsi-sctp/archive/04269a7342fbd3bd66dd40ed892cfc80559d62d4.tar.gz +SOURCE_SUM=3aa5b7b913158388e0403162c524d41415ad5ec1db0187500da5fcdd607f8321 SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip +SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=jitsi-sctp-master.zip SOURCE_EXTRACT=true From c1fc190c944e29aa72d586a991fb3c5b2a61a3c7 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 14:28:57 -0400 Subject: [PATCH 37/81] Update usrsctp.src --- conf/usrsctp.src | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/conf/usrsctp.src b/conf/usrsctp.src index 4632bbd..aeb80da 100644 --- a/conf/usrsctp.src +++ b/conf/usrsctp.src @@ -1,7 +1,6 @@ -SOURCE_URL=https://github.com/sctplab/usrsctp/archive/refs/heads/master.zip -SOURCE_SUM=1daee6f1a7b81478ac4d1e154f5cfdc3d35f45515dca3e1d6941d8d570cf95a1 +SOURCE_URL=https://github.com/sctplab/usrsctp/archive/c138bc04bbb20b34fc10fd50e34c1723c40896c4.tar.gz +SOURCE_SUM=ff4808da7c4bbd886feeb03a74eee1cb235a7d4c9a20c16a37581fe10d55dd4b SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip +SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=usrsctp-master.zip SOURCE_EXTRACT=true From 4468ad7f9c168b29d60f579a93429fd25ac75d67 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 14:34:18 -0400 Subject: [PATCH 38/81] Update install --- scripts/install | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 6643a6f..fe3b02c 100644 --- a/scripts/install +++ b/scripts/install @@ -98,11 +98,10 @@ ynh_app_setting_set --app=$app --key=port_component --value=$port_component #================================================= ynh_script_progression --message="Installing dependencies..." -ynh_package_update # install generic dependencies ynh_install_app_dependencies $pkg_dependencies -if [ $(uname -m) == "armv7l" ] +if [ $YNH_ARCH == "armhf" ] then # install arm specific depedencies to compile extra dependencies ynh_install_app_dependencies $pkg_dependencies_arm @@ -226,9 +225,9 @@ ynh_add_config --template="../conf/jitsi-videobridge-sip-communicator.properties ynh_add_config --template="../conf/jitsi-videobridge.config" --destination="/etc/$app/videobridge/config" #================================================= -# REPLACE JNIWRAPPER FOR ARMV7L AARCHITECTURE +# REPLACE JNIWRAPPER FOR ARMHF AARCHITECTURE #================================================= -if [ $(uname -m) == "armv7l" ] +if [ $YNH_ARCH == "armhf" ] then # set openjdk-8 as default sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-armhf/jre/bin/java From 3d03f6af0f46f9a6548f8e37f82a35709bd7b505 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 14:39:43 -0400 Subject: [PATCH 39/81] Update _common.sh --- scripts/_common.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index 6179405..9d2914f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -21,6 +21,46 @@ ynh_version_gt () dpkg --compare-versions "$1" gt "$2" } +ynh_jniwrapper_armhf () +{ + if [ $YNH_ARCH == "armhf" ] + then + # set openjdk-8 as default + sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-armhf/jre/bin/java + tempdir="$(mktemp -d)" + + # prepare jniwrapper compilation + export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-armhf + + declare -A packages_arm + packages_arm[jitsi-sctp]="jitsi-sctp" + packages_arm[usrsctp]="jitsi-sctp/usrsctp" + + for packages_arm in "${!packages_arm[@]}" + do + ynh_setup_source --dest_dir="$tempdir" --source_id=$packages_arm + done + + # needed to make compile works + if [ ! -d "$tempdir/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/" ] + then + mkdir -p $tempdir/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/ + fi + + pushd "$tempdir/jitsi-sctp" + mvn package -DbuildSctp -DbuildNativeWrapper -DdeployNewJnilib -DskipTests + mvn package + popd + + # rm official jniwrapper to copy + rm "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-8-g04269a7.jar" + mv "$tempdir/jitsi-sctp/jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" + + ynh_secure_remove --file="$tempdir" + fi +} + + #================================================= # EXPERIMENTAL HELPERS #================================================= From 3aaea89145be266c615d261f2ff0dc7a71e17d17 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 14:39:48 -0400 Subject: [PATCH 40/81] Update install --- scripts/install | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/scripts/install b/scripts/install index fe3b02c..0c58cf7 100644 --- a/scripts/install +++ b/scripts/install @@ -227,43 +227,7 @@ ynh_add_config --template="../conf/jitsi-videobridge.config" --destination="/etc #================================================= # REPLACE JNIWRAPPER FOR ARMHF AARCHITECTURE #================================================= -if [ $YNH_ARCH == "armhf" ] -then - # set openjdk-8 as default - sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-armhf/jre/bin/java - tempdir="$(mktemp -d)" - - # prepare jniwrapper compilation - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-armhf - - declare -A packages_arm - packages_arm[jitsi-sctp]="jitsi-sctp" - packages_arm[usrsctp]="jitsi-sctp/usrsctp" - - for packages_arm in "${!packages_arm[@]}" - do - ynh_setup_source --dest_dir="$tempdir" --source_id=$packages_arm - done - - # needed to make compile works - if [ ! -d "$tempdir/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/" ] - then - mkdir -p $tempdir/jitsi-sctp/jniwrapper/native/src/main/resources/lib/linux-arm/ - fi - - pushd "$tempdir/jitsi-sctp" - mvn package -DbuildSctp -DbuildNativeWrapper -DdeployNewJnilib -DskipTests - mvn package - popd - - # rm official jniwrapper to copy - rm "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-8-g04269a7.jar" - mv "$tempdir/jitsi-sctp/jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" - - ynh_secure_remove --file="$tempdir" - -fi - +ynh_jniwrapper_armhf #================================================= # CONFIGURE JITSI-JICOFO From 2d8053ef96058d432e272dae89cfa0644ceccbf5 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 14:41:11 -0400 Subject: [PATCH 41/81] Update _common.sh --- scripts/_common.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 9d2914f..54fce5f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -23,8 +23,6 @@ ynh_version_gt () ynh_jniwrapper_armhf () { - if [ $YNH_ARCH == "armhf" ] - then # set openjdk-8 as default sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-armhf/jre/bin/java tempdir="$(mktemp -d)" @@ -57,7 +55,6 @@ ynh_jniwrapper_armhf () mv "$tempdir/jitsi-sctp/jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" ynh_secure_remove --file="$tempdir" - fi } From 1aada86a0fc22bf1934efc58d2fdbe3eda1744a7 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 14:41:17 -0400 Subject: [PATCH 42/81] Update install --- scripts/install | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 0c58cf7..51a5de3 100644 --- a/scripts/install +++ b/scripts/install @@ -227,8 +227,10 @@ ynh_add_config --template="../conf/jitsi-videobridge.config" --destination="/etc #================================================= # REPLACE JNIWRAPPER FOR ARMHF AARCHITECTURE #================================================= -ynh_jniwrapper_armhf - +if [ $YNH_ARCH == "armhf" ] +then + ynh_jniwrapper_armhf +fi #================================================= # CONFIGURE JITSI-JICOFO #================================================= From 6baeb88ac831b26adfe06ebca3b135e45b480c91 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 14:43:57 -0400 Subject: [PATCH 43/81] Update install --- scripts/install | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/install b/scripts/install index 51a5de3..1d17e40 100644 --- a/scripts/install +++ b/scripts/install @@ -227,10 +227,13 @@ ynh_add_config --template="../conf/jitsi-videobridge.config" --destination="/etc #================================================= # REPLACE JNIWRAPPER FOR ARMHF AARCHITECTURE #================================================= +ynh_script_progression --message="Configuring jniwrapper for armhf ..." + if [ $YNH_ARCH == "armhf" ] then ynh_jniwrapper_armhf fi + #================================================= # CONFIGURE JITSI-JICOFO #================================================= From ee17fe70e87cf2899da8550cbab265063f358b52 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 14:48:01 -0400 Subject: [PATCH 44/81] Update _common.sh --- scripts/_common.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 54fce5f..e7b57af 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -23,8 +23,9 @@ ynh_version_gt () ynh_jniwrapper_armhf () { + # set openjdk-8 as default - sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-armhf/jre/bin/java + update-alternatives --set java /usr/lib/jvm/java-8-openjdk-armhf/jre/bin/java tempdir="$(mktemp -d)" # prepare jniwrapper compilation @@ -51,7 +52,7 @@ ynh_jniwrapper_armhf () popd # rm official jniwrapper to copy - rm "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-8-g04269a7.jar" + ynh_secure_remove --file="$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-8-g04269a7.jar" mv "$tempdir/jitsi-sctp/jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" ynh_secure_remove --file="$tempdir" From fb97d088cff5dbfcc0beff443fbbe13c824cf7ea Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 14:49:56 -0400 Subject: [PATCH 45/81] Update upgrade --- scripts/upgrade | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index b716c03..56e251e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -145,6 +145,15 @@ ynh_script_progression --message="Upgrading dependencies..." ynh_install_app_dependencies $pkg_dependencies +if [ $YNH_ARCH == "armhf" ] +then + # install arm specific depedencies to compile extra dependencies + ynh_install_app_dependencies $pkg_dependencies_arm + + # install extra dependencies not present in default debian repositories + ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security/ $(lsb_release -cs)/updates main" --package="$pkg_extra_dependencies_arm" +fi + if ! yunohost app list | grep -q "prosody" then yunohost tools update @@ -200,6 +209,16 @@ then ynh_add_config --template="../conf/jitsi-videobridge.config" --destination="/etc/$app/videobridge/config" fi +#================================================= +# REPLACE JNIWRAPPER FOR ARMHF ARCHITECTURE +#================================================= +ynh_script_progression --message="Configuring jniwrapper for armhf ..." + +if [ $YNH_ARCH == "armhf" ] +then + ynh_jniwrapper_armhf +fi + #================================================= # CONFIGURE JITSI-JICOFO #================================================= From 6748a438a61e5a7c229f2bb7074ffc56a7f657c1 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 14:52:05 -0400 Subject: [PATCH 46/81] Update restore --- scripts/restore | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/restore b/scripts/restore index 702caea..ac23e2c 100644 --- a/scripts/restore +++ b/scripts/restore @@ -89,6 +89,15 @@ ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies +if [ $YNH_ARCH == "armhf" ] +then + # install arm specific depedencies to compile extra dependencies + ynh_install_app_dependencies $pkg_dependencies_arm + + # install extra dependencies not present in default debian repositories + ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security/ $(lsb_release -cs)/updates main" --package="$pkg_extra_dependencies_arm" +fi + if ! yunohost app list | grep -q "prosody" then yunohost tools update From fb19b7fdf3e33e79ec46a5b6f79da3bbfae44ef5 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 14:53:21 -0400 Subject: [PATCH 47/81] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index e7b57af..e08ee17 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -52,7 +52,7 @@ ynh_jniwrapper_armhf () popd # rm official jniwrapper to copy - ynh_secure_remove --file="$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-8-g04269a7.jar" + ynh_secure_remove --file="$final_path/jitsi-videobridge/lib/jniwrapper-native-*.jar" mv "$tempdir/jitsi-sctp/jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" ynh_secure_remove --file="$tempdir" From 05146e2e78e48912bc7fb9c66bd5a29bf269e95e Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 14:59:52 -0400 Subject: [PATCH 48/81] Update _common.sh --- scripts/_common.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index e08ee17..eef890b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,10 +7,7 @@ # dependencies used by the app pkg_dependencies="openjdk-8-jre-headless|openjdk-11-jre-headless debconf|debconf-2.0 procps uuid-runtime lua-ldap" pkg_dependencies_arm="automake autoconf build-essential libtool git maven m4" -pkg_extra_dependencies_arm="openjdk-8-jre_8u322-b06-1~deb9u1_armhf.deb \ - openjdk-8-jre-headless_8u322-b06-1~deb9u1_armhf.deb \ - openjdk-8-jdf_8u322-b06-1~deb9u1_armhf.deb \ - openjdk-8-jdk-headless_8u322-b06-1~deb9u1_armhf.deb" +pkg_extra_dependencies_arm="openjdk-8-jre openjdk-8-jre-headless openjdk-8-jdf openjdk-8-jdk-headless" #================================================= # PERSONAL HELPERS From a63933e5f72aa037078ce1521ce3c8b6352d82f0 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 15:10:08 -0400 Subject: [PATCH 49/81] Update install --- scripts/install | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scripts/install b/scripts/install index 1d17e40..df6f7c2 100644 --- a/scripts/install +++ b/scripts/install @@ -101,15 +101,6 @@ ynh_script_progression --message="Installing dependencies..." # install generic dependencies ynh_install_app_dependencies $pkg_dependencies -if [ $YNH_ARCH == "armhf" ] -then - # install arm specific depedencies to compile extra dependencies - ynh_install_app_dependencies $pkg_dependencies_arm - - # install extra dependencies not present in default debian repositories - ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security/ $(lsb_release -cs)/updates main" --package="$pkg_extra_dependencies_arm" -fi - if ! yunohost app list | grep -q "prosody" then yunohost tools update From 80b01d7fa253906d0dad13f09b839e33647fab0f Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 15:11:25 -0400 Subject: [PATCH 50/81] Update install --- scripts/install | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/install b/scripts/install index df6f7c2..8c2d05e 100644 --- a/scripts/install +++ b/scripts/install @@ -98,7 +98,6 @@ ynh_app_setting_set --app=$app --key=port_component --value=$port_component #================================================= ynh_script_progression --message="Installing dependencies..." -# install generic dependencies ynh_install_app_dependencies $pkg_dependencies if ! yunohost app list | grep -q "prosody" From f1f585f8f0216ee62de9b97a9ee0c4ccd3246cfc Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 15:11:30 -0400 Subject: [PATCH 51/81] Update upgrade --- scripts/upgrade | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 56e251e..9a3853c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -82,7 +82,7 @@ fi # If max_memory doesn't exist, create it and set to default 75 mb value if [ -z "$max_memory" ]; then - max_memory=75 + max_memory=200 ynh_app_setting_set --app=$app --key=max_memory --value=$max_memory fi @@ -145,15 +145,6 @@ ynh_script_progression --message="Upgrading dependencies..." ynh_install_app_dependencies $pkg_dependencies -if [ $YNH_ARCH == "armhf" ] -then - # install arm specific depedencies to compile extra dependencies - ynh_install_app_dependencies $pkg_dependencies_arm - - # install extra dependencies not present in default debian repositories - ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security/ $(lsb_release -cs)/updates main" --package="$pkg_extra_dependencies_arm" -fi - if ! yunohost app list | grep -q "prosody" then yunohost tools update From 8f2f07780fbefcfa09a981b4a350a385951af6c0 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 15:11:48 -0400 Subject: [PATCH 52/81] Update restore --- scripts/restore | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scripts/restore b/scripts/restore index ac23e2c..702caea 100644 --- a/scripts/restore +++ b/scripts/restore @@ -89,15 +89,6 @@ ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies -if [ $YNH_ARCH == "armhf" ] -then - # install arm specific depedencies to compile extra dependencies - ynh_install_app_dependencies $pkg_dependencies_arm - - # install extra dependencies not present in default debian repositories - ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security/ $(lsb_release -cs)/updates main" --package="$pkg_extra_dependencies_arm" -fi - if ! yunohost app list | grep -q "prosody" then yunohost tools update From 651a055b472c4cf6e5011bc030df8095b18cc2cf Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 14 Apr 2022 21:11:55 +0200 Subject: [PATCH 53/81] more sexy --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index df6f7c2..c3055fc 100644 --- a/scripts/install +++ b/scripts/install @@ -218,10 +218,10 @@ ynh_add_config --template="../conf/jitsi-videobridge.config" --destination="/etc #================================================= # REPLACE JNIWRAPPER FOR ARMHF AARCHITECTURE #================================================= -ynh_script_progression --message="Configuring jniwrapper for armhf ..." if [ $YNH_ARCH == "armhf" ] then + ynh_script_progression --message="Configuring jniwrapper for armhf ..." ynh_jniwrapper_armhf fi diff --git a/scripts/upgrade b/scripts/upgrade index 56e251e..019c1b0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -212,10 +212,10 @@ fi #================================================= # REPLACE JNIWRAPPER FOR ARMHF ARCHITECTURE #================================================= -ynh_script_progression --message="Configuring jniwrapper for armhf ..." if [ $YNH_ARCH == "armhf" ] then + ynh_script_progression --message="Configuring jniwrapper for armhf ..." ynh_jniwrapper_armhf fi From 5fa3872ca7ed28cd541820a8996eb59f72b07e3a Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 15:12:00 -0400 Subject: [PATCH 54/81] Update _common.sh --- scripts/_common.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index eef890b..62b6d95 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,9 +6,14 @@ # dependencies used by the app pkg_dependencies="openjdk-8-jre-headless|openjdk-11-jre-headless debconf|debconf-2.0 procps uuid-runtime lua-ldap" -pkg_dependencies_arm="automake autoconf build-essential libtool git maven m4" -pkg_extra_dependencies_arm="openjdk-8-jre openjdk-8-jre-headless openjdk-8-jdf openjdk-8-jdk-headless" +if [ $YNH_ARCH == "armhf" ] +then + pkg_dependencies_arm="openjdk-8-jre openjdk-8-jre-headless openjdk-8-jdf openjdk-8-jdk-headless \ + automake autoconf build-essential libtool git maven m4" + + pkg_dependencies="$pkg_dependencies $pkg_dependencies_arm" +fi #================================================= # PERSONAL HELPERS #================================================= From b7f4a95e0398404b0f9c095aced078d62c0caa13 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 15:16:33 -0400 Subject: [PATCH 55/81] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 62b6d95..5ff5c8a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,7 +9,7 @@ pkg_dependencies="openjdk-8-jre-headless|openjdk-11-jre-headless debconf|debconf if [ $YNH_ARCH == "armhf" ] then - pkg_dependencies_arm="openjdk-8-jre openjdk-8-jre-headless openjdk-8-jdf openjdk-8-jdk-headless \ + pkg_dependencies_arm="openjdk-8-jre openjdk-8-jre-headless openjdk-8-jdk openjdk-8-jdk-headless \ automake autoconf build-essential libtool git maven m4" pkg_dependencies="$pkg_dependencies $pkg_dependencies_arm" From 3848024c1eca1a9af64c0bff3cb107d969d86201 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 15:23:31 -0400 Subject: [PATCH 56/81] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 5ff5c8a..b4c7bc1 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -27,7 +27,7 @@ ynh_jniwrapper_armhf () { # set openjdk-8 as default - update-alternatives --set java /usr/lib/jvm/java-8-openjdk-armhf/jre/bin/java + # update-alternatives --set java /usr/lib/jvm/java-8-openjdk-armhf/jre/bin/java tempdir="$(mktemp -d)" # prepare jniwrapper compilation From aaaa0344ea95064254e9380e4716347879b601f3 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 15:28:17 -0400 Subject: [PATCH 57/81] Update jitsi-sctp.src --- conf/jitsi-sctp.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/jitsi-sctp.src b/conf/jitsi-sctp.src index e0cc99b..034ec40 100644 --- a/conf/jitsi-sctp.src +++ b/conf/jitsi-sctp.src @@ -1,5 +1,5 @@ SOURCE_URL=https://github.com/jitsi/jitsi-sctp/archive/04269a7342fbd3bd66dd40ed892cfc80559d62d4.tar.gz -SOURCE_SUM=3aa5b7b913158388e0403162c524d41415ad5ec1db0187500da5fcdd607f8321 +SOURCE_SUM=2aa4f596e96186d43f4beb3e9db9907d23b993d974e15dd051031f4d00423bf2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From aa1466b5889d8f85395b69f55d2321acb2b6b133 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 15:50:51 -0400 Subject: [PATCH 58/81] Update _common.sh --- scripts/_common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index b4c7bc1..994b692 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -37,9 +37,9 @@ ynh_jniwrapper_armhf () packages_arm[jitsi-sctp]="jitsi-sctp" packages_arm[usrsctp]="jitsi-sctp/usrsctp" - for packages_arm in "${!packages_arm[@]}" + for package_arm in "${!packages_arm[@]}" do - ynh_setup_source --dest_dir="$tempdir" --source_id=$packages_arm + ynh_setup_source --dest_dir="$tempdir/${packages_arm[$package_arm]}" --source_id=$package_arm done # needed to make compile works From 37ddece19c08043bd7ff63469ddacd07908e665b Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 18:07:38 -0400 Subject: [PATCH 59/81] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 994b692..4de18b7 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -35,7 +35,7 @@ ynh_jniwrapper_armhf () declare -A packages_arm packages_arm[jitsi-sctp]="jitsi-sctp" - packages_arm[usrsctp]="jitsi-sctp/usrsctp" + packages_arm[usrsctp]="jitsi-sctp/usrsctp/usrsctp" for package_arm in "${!packages_arm[@]}" do From 350f20b80654c3ea2aebff6ec17005211321d2b3 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 18:22:14 -0400 Subject: [PATCH 60/81] Update _common.sh --- scripts/_common.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 4de18b7..d53046c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,10 +9,10 @@ pkg_dependencies="openjdk-8-jre-headless|openjdk-11-jre-headless debconf|debconf if [ $YNH_ARCH == "armhf" ] then - pkg_dependencies_arm="openjdk-8-jre openjdk-8-jre-headless openjdk-8-jdk openjdk-8-jdk-headless \ - automake autoconf build-essential libtool git maven m4" - - pkg_dependencies="$pkg_dependencies $pkg_dependencies_arm" + pkg_dependencies_arm="automake autoconf build-essential libtool git maven m4" + pkg_dependencies="$pkg_dependencies $pkg_dependencies_arm" + + pkg_extra_depedencies_arm="openjdk-8-jre openjdk-8-jre-headless openjdk-8-jdk openjdk-8-jdk-headless" fi #================================================= # PERSONAL HELPERS From a17410a9c3fd5f739e48b2ff71d932814836b37c Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 18:28:49 -0400 Subject: [PATCH 61/81] Update upgrade --- scripts/upgrade | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 8f7bbff..0d52661 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -145,6 +145,12 @@ ynh_script_progression --message="Upgrading dependencies..." ynh_install_app_dependencies $pkg_dependencies +if [ $YNH_ARCH == "armhf" ] +then + ynh_script_progression --message="Upgrade specific arm dependencies..." + ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security stretch/updates main" $pkg_extra_depedencies_arm +fi + if ! yunohost app list | grep -q "prosody" then yunohost tools update From d7e3690ec2bc05750caceaf9605ddc2d8e42016a Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 18:59:38 -0400 Subject: [PATCH 62/81] Update install --- scripts/install | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/install b/scripts/install index 2667b0e..ba4d122 100644 --- a/scripts/install +++ b/scripts/install @@ -99,6 +99,12 @@ ynh_app_setting_set --app=$app --key=port_component --value=$port_component ynh_script_progression --message="Installing dependencies..." ynh_install_app_dependencies $pkg_dependencies +if [ $YNH_ARCH == "armhf" ] +then + ynh_script_progression --message="Installing specific arm dependencies..." + ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security stretch/updates main" $pkg_extra_depedencies_arm --name=$app-stretch +fi + if ! yunohost app list | grep -q "prosody" then From 60f73a23915dabaef8dd41ad4db69122d70b32e7 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 19:23:18 -0400 Subject: [PATCH 63/81] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index ba4d122..8aad00e 100644 --- a/scripts/install +++ b/scripts/install @@ -102,7 +102,7 @@ ynh_install_app_dependencies $pkg_dependencies if [ $YNH_ARCH == "armhf" ] then ynh_script_progression --message="Installing specific arm dependencies..." - ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security stretch/updates main" $pkg_extra_depedencies_arm --name=$app-stretch + ynh_install_extra_app_dependencies --repo="deb [arch=armhf] http://security.debian.org/debian-security stretch/updates main" $pkg_extra_depedencies_arm fi From 11721e44e09f2319a66584e855ca7321267e22b9 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 19:58:10 -0400 Subject: [PATCH 64/81] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 8aad00e..8966401 100644 --- a/scripts/install +++ b/scripts/install @@ -102,7 +102,7 @@ ynh_install_app_dependencies $pkg_dependencies if [ $YNH_ARCH == "armhf" ] then ynh_script_progression --message="Installing specific arm dependencies..." - ynh_install_extra_app_dependencies --repo="deb [arch=armhf] http://security.debian.org/debian-security stretch/updates main" $pkg_extra_depedencies_arm + ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security stretch/updates main" --package="$pkg_extra_depedencies_arm" fi From cccbe887a3df0b5593ba8b160da3a78f0b69a47b Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 20:00:06 -0400 Subject: [PATCH 65/81] Update upgrade --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 0d52661..0a55304 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -147,8 +147,8 @@ ynh_install_app_dependencies $pkg_dependencies if [ $YNH_ARCH == "armhf" ] then - ynh_script_progression --message="Upgrade specific arm dependencies..." - ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security stretch/updates main" $pkg_extra_depedencies_arm + ynh_script_progression --message="Installing specific arm dependencies..." + ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security stretch/updates main" --package="$pkg_extra_depedencies_arm" fi if ! yunohost app list | grep -q "prosody" From 6ed98d4fcd1cc80a7aacf1b630675d85a96a84e5 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 20:41:42 -0400 Subject: [PATCH 66/81] Update _common.sh --- scripts/_common.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index d53046c..48eed6b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -54,9 +54,11 @@ ynh_jniwrapper_armhf () popd # rm official jniwrapper to copy - ynh_secure_remove --file="$final_path/jitsi-videobridge/lib/jniwrapper-native-*.jar" mv "$tempdir/jitsi-sctp/jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" + chmod 640 "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-SNAPSHOT.jar" + chown -R $app:$app "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-SNAPSHOT.jar" + ynh_secure_remove --file="$tempdir" } From 9e97101829c594c93ce71698e78304ee61cc4d27 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 20:44:33 -0400 Subject: [PATCH 67/81] Update _common.sh --- scripts/_common.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 48eed6b..2f6ebdd 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -53,12 +53,14 @@ ynh_jniwrapper_armhf () mvn package popd - # rm official jniwrapper to copy mv "$tempdir/jitsi-sctp/jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" chmod 640 "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-SNAPSHOT.jar" chown -R $app:$app "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-SNAPSHOT.jar" + # rm official jniwrapper to copy + ynh_secure_remove --file="$final_path/jitsi-videobridge/lib/jniwrapper-native-*.jar" + ynh_secure_remove --file="$tempdir" } From b15cfb3f500e06d12e29b562dd60efeccb3146ae Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 20:44:50 -0400 Subject: [PATCH 68/81] Update install --- scripts/install | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/scripts/install b/scripts/install index 8966401..6db9a34 100644 --- a/scripts/install +++ b/scripts/install @@ -220,16 +220,6 @@ ynh_add_config --template="../conf/jitsi-videobridge-sip-communicator.properties ynh_add_config --template="../conf/jitsi-videobridge.config" --destination="/etc/$app/videobridge/config" -#================================================= -# REPLACE JNIWRAPPER FOR ARMHF AARCHITECTURE -#================================================= - -if [ $YNH_ARCH == "armhf" ] -then - ynh_script_progression --message="Configuring jniwrapper for armhf ..." - ynh_jniwrapper_armhf -fi - #================================================= # CONFIGURE JITSI-JICOFO #================================================= @@ -306,6 +296,17 @@ ynh_script_progression --message="Starting a systemd service..." ynh_systemd_action --service_name=$app-jicofo --action="start" --log_path="/var/log/$app/$app-jicofo.log" ynh_systemd_action --service_name=$app-videobridge --action="start" --log_path="/var/log/$app/$app-videobridge.log" +#================================================= +# REPLACE JNIWRAPPER FOR ARMHF AARCHITECTURE +#================================================= + +if [ $YNH_ARCH == "armhf" ] +then + ynh_script_progression --message="Configuring jniwrapper for armhf ..." + ynh_jniwrapper_armhf + +fi + #================================================= # SETUP SSOWAT #================================================= From a07d9e14221d570cec6e7bfb9ec9a185dc8c943b Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 21:48:55 -0400 Subject: [PATCH 69/81] Update upgrade --- scripts/upgrade | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 0a55304..129d664 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -206,16 +206,6 @@ then ynh_add_config --template="../conf/jitsi-videobridge.config" --destination="/etc/$app/videobridge/config" fi -#================================================= -# REPLACE JNIWRAPPER FOR ARMHF ARCHITECTURE -#================================================= - -if [ $YNH_ARCH == "armhf" ] -then - ynh_script_progression --message="Configuring jniwrapper for armhf ..." - ynh_jniwrapper_armhf -fi - #================================================= # CONFIGURE JITSI-JICOFO #================================================= @@ -300,6 +290,17 @@ ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload +#================================================= +# REPLACE JNIWRAPPER FOR ARMHF ARCHITECTURE +#================================================= +# jitsi need to be started at least once. why ? modifications will be taken event without restarting services. + +if [ $YNH_ARCH == "armhf" ] +then + ynh_script_progression --message="Configuring jniwrapper for armhf ..." + ynh_jniwrapper_armhf +fi + #================================================= # END OF SCRIPT #================================================= From d9d44cab0bd049d9c244d5e38424233fe53fb642 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Thu, 14 Apr 2022 21:49:18 -0400 Subject: [PATCH 70/81] Update install --- scripts/install | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/install b/scripts/install index 6db9a34..17ee688 100644 --- a/scripts/install +++ b/scripts/install @@ -296,17 +296,6 @@ ynh_script_progression --message="Starting a systemd service..." ynh_systemd_action --service_name=$app-jicofo --action="start" --log_path="/var/log/$app/$app-jicofo.log" ynh_systemd_action --service_name=$app-videobridge --action="start" --log_path="/var/log/$app/$app-videobridge.log" -#================================================= -# REPLACE JNIWRAPPER FOR ARMHF AARCHITECTURE -#================================================= - -if [ $YNH_ARCH == "armhf" ] -then - ynh_script_progression --message="Configuring jniwrapper for armhf ..." - ynh_jniwrapper_armhf - -fi - #================================================= # SETUP SSOWAT #================================================= @@ -322,6 +311,17 @@ ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload +#================================================= +# REPLACE JNIWRAPPER FOR ARMHF AARCHITECTURE +#================================================= + +if [ $YNH_ARCH == "armhf" ] +then + ynh_script_progression --message="Configuring jniwrapper for armhf ..." + ynh_jniwrapper_armhf + +fi + #================================================= # END OF SCRIPT #================================================= From 23081bfdb77fd9785a62393d6fafc71c3e3fdd6f Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Fri, 15 Apr 2022 08:38:55 -0400 Subject: [PATCH 71/81] Update _common.sh --- scripts/_common.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 2f6ebdd..cb1e1ae 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -53,14 +53,15 @@ ynh_jniwrapper_armhf () mvn package popd + # rm official jniwrapper to copy + original_jniwrapper=$(ls $final_path/jitsi-videobridge/lib/jniwrapper-native-*.jar + ynh_secure_remove --file="$original_jniwrapper" + mv "$tempdir/jitsi-sctp/jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" chmod 640 "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-SNAPSHOT.jar" chown -R $app:$app "$final_path/jitsi-videobridge/lib/jniwrapper-native-1.0-SNAPSHOT.jar" - # rm official jniwrapper to copy - ynh_secure_remove --file="$final_path/jitsi-videobridge/lib/jniwrapper-native-*.jar" - ynh_secure_remove --file="$tempdir" } From c49e4419654174866633cf464aa4c38cfb53c47c Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Fri, 15 Apr 2022 08:40:28 -0400 Subject: [PATCH 72/81] Update install --- scripts/install | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/install b/scripts/install index 17ee688..f301ad2 100644 --- a/scripts/install +++ b/scripts/install @@ -220,6 +220,17 @@ ynh_add_config --template="../conf/jitsi-videobridge-sip-communicator.properties ynh_add_config --template="../conf/jitsi-videobridge.config" --destination="/etc/$app/videobridge/config" +#================================================= +# REPLACE JNIWRAPPER FOR ARMHF ARCHITECTURE IN JITSI-VIDEOBRIDGE +#================================================= + +if [ $YNH_ARCH == "armhf" ] +then + ynh_script_progression --message="Configuring jniwrapper for armhf ..." + ynh_jniwrapper_armhf + +fi + #================================================= # CONFIGURE JITSI-JICOFO #================================================= @@ -311,17 +322,6 @@ ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload -#================================================= -# REPLACE JNIWRAPPER FOR ARMHF AARCHITECTURE -#================================================= - -if [ $YNH_ARCH == "armhf" ] -then - ynh_script_progression --message="Configuring jniwrapper for armhf ..." - ynh_jniwrapper_armhf - -fi - #================================================= # END OF SCRIPT #================================================= From 33c7fb54dafbee0ad3b43d88713bf7454044ff42 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Fri, 15 Apr 2022 08:41:11 -0400 Subject: [PATCH 73/81] Update upgrade --- scripts/upgrade | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 129d664..0cf8379 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -206,6 +206,18 @@ then ynh_add_config --template="../conf/jitsi-videobridge.config" --destination="/etc/$app/videobridge/config" fi + +#================================================= +# REPLACE JNIWRAPPER FOR ARMHF ARCHITECTURE IN JITSI-VIDEOBRIDGE +#================================================= + +if [ $YNH_ARCH == "armhf" ] +then + ynh_script_progression --message="Configuring jniwrapper for armhf ..." + ynh_jniwrapper_armhf + +fi + #================================================= # CONFIGURE JITSI-JICOFO #================================================= @@ -290,17 +302,6 @@ ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload -#================================================= -# REPLACE JNIWRAPPER FOR ARMHF ARCHITECTURE -#================================================= -# jitsi need to be started at least once. why ? modifications will be taken event without restarting services. - -if [ $YNH_ARCH == "armhf" ] -then - ynh_script_progression --message="Configuring jniwrapper for armhf ..." - ynh_jniwrapper_armhf -fi - #================================================= # END OF SCRIPT #================================================= From 0cbb6506e80c0bada45f0de59172b88465f9a47d Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Fri, 15 Apr 2022 09:06:38 -0400 Subject: [PATCH 74/81] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index cb1e1ae..992eb27 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -54,7 +54,7 @@ ynh_jniwrapper_armhf () popd # rm official jniwrapper to copy - original_jniwrapper=$(ls $final_path/jitsi-videobridge/lib/jniwrapper-native-*.jar + original_jniwrapper=$(ls $final_path/jitsi-videobridge/lib/jniwrapper-native-*.jar) ynh_secure_remove --file="$original_jniwrapper" mv "$tempdir/jitsi-sctp/jniwrapper/native/target/jniwrapper-native-1.0-SNAPSHOT.jar" "$final_path/jitsi-videobridge/lib/" From 41382b353b9df26d3049f016e090da4c1ec71d00 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Fri, 15 Apr 2022 10:36:06 -0400 Subject: [PATCH 75/81] Update README.md --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d3e976e..51e70b0 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,11 @@ Jitsi Meet is a libre software (Apache) WebRTC JavaScript app that uses Jitsi Vi 2. **Jitsi** requires the ports TCP/4443 and UDP/10000 to be forwarded to your YunoHost (The same way you forwarded 80 (HTTP), 443 (HTTPS), etc... https://yunohost.org/#/isp_box_config) 3. **Jitsi** will stop and disable Metronome XMPP. 4. LDAP authentication is activated, only authenticated users to create new conference rooms. Whenever a new room is about to be created, Jitsi Meet will prompt for a user name and password. After the room is created, others will be able to join from anonymous domain. -5. **Jitsi** is configured for 50 users maximum, this number can be increase going to the Yunohost config panel +5. **Jitsi** is configured for to user 200MiB memory (next to 50 simultaneus users), this number can be increase going to the Yunohost config panel +5. **Jitsi** is compatible with armhf architecture, it was tested on odroid xu4 and hc1. + +## known bug +- if a second user join before the first user declared himself as moderator video and sound should never appear, reload page should correct the problem ## Documentation and resources @@ -55,4 +59,4 @@ or sudo yunohost app upgrade jitsi -u https://github.com/YunoHost-Apps/jitsi_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** https://yunohost.org/packaging_apps From 6660d1bdd9753e7c22f8068a599a1c7357861925 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Fri, 15 Apr 2022 10:37:27 -0400 Subject: [PATCH 76/81] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 51e70b0..4f5b629 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Jitsi Meet is a libre software (Apache) WebRTC JavaScript app that uses Jitsi Vi 1. **Jitsi** requires a dedicated **root domain**, eg. jitsi.domain.tld 2. **Jitsi** requires the ports TCP/4443 and UDP/10000 to be forwarded to your YunoHost (The same way you forwarded 80 (HTTP), 443 (HTTPS), etc... https://yunohost.org/#/isp_box_config) 3. **Jitsi** will stop and disable Metronome XMPP. -4. LDAP authentication is activated, only authenticated users to create new conference rooms. Whenever a new room is about to be created, Jitsi Meet will prompt for a user name and password. After the room is created, others will be able to join from anonymous domain. +4. LDAP authentication is activated, only authenticated users can create new conference rooms. Whenever a new room is about to be created, Jitsi Meet will prompt for a user name and password. After the room is created, others will be able to join from anonymous domain. 5. **Jitsi** is configured for to user 200MiB memory (next to 50 simultaneus users), this number can be increase going to the Yunohost config panel 5. **Jitsi** is compatible with armhf architecture, it was tested on odroid xu4 and hc1. From f77c75e30f9d00928007ab7c971d0912ee247edf Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Fri, 15 Apr 2022 10:38:11 -0400 Subject: [PATCH 77/81] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 876adda..5103063 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.5913~ynh2", + "version": "1.0.5913~ynh3", "url": "https://jitsi.org/Projects/JitMeet", "upstream": { "license": "Apache-2.0", From 42344955488a271449786198028fe0c07ff88370 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Fri, 15 Apr 2022 10:42:41 -0400 Subject: [PATCH 78/81] Update README_fr.md --- README_fr.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README_fr.md b/README_fr.md index 58bd579..2a46a90 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,11 @@ Jitsi Meet est un logiciel libre (Apache) dont Jitsi Videobridge, avec WebRTC Ja 2. **Jitsi** demande que les ports TCP/4443 et UDP/10000 soient routés vers votre YunoHost (De la même manière que le sont les ports 80 (HTTP), 443 (HTTPS), etc... https://yunohost.org/#/isp_box_config) 3. **Jitsi** va arréter et désactiver le service XMPP Metronome. 4. L'authentification LDAP est activée, seuls les utilisateurs authentifiés peuvent créer de nouvelles salles de conférence. Chaque fois qu'une nouvelle salle est sur le point d'être créée, Jitsi Meet vous demandera un nom d'utilisateur et un mot de passe. Une fois la salle créée, d'autres personnes pourront la rejoindre à partir d'un domaine anonyme. -5. **Jitsi** est configuré pour 50 utilisateurs maximum, ce nombre peut être augmenté en allant dans le panneau de configuration Yunohost +5. **Jitsi** est configuré pour utiliser 200MiB (equivalent a 50 utilisateurs maximum), ce nombre peut être augmenté en allant dans le panneau de configuration Yunohost +6. **Jitsi** est compatible avec l'architecture armhf (testé sur odroid XU4 et HC1) + +## Bugs connus +- si un second utilisateur rejoins le salon avant que le premié ne se soit déclaré comme modérateur, il risque de ne pas y avoir de partage de video et d'audio. Un rechargement de la page devrait suffir apres que le modérateur se soit identifé. ## Documentations et ressources @@ -51,4 +55,4 @@ ou sudo yunohost app upgrade jitsi -u https://github.com/YunoHost-Apps/jitsi_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps From 854fca9246a776d14a05e4b256058de7ca430ad1 Mon Sep 17 00:00:00 2001 From: rosbeef andino Date: Fri, 15 Apr 2022 10:45:28 -0400 Subject: [PATCH 79/81] Update config_panel.toml --- config_panel.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config_panel.toml b/config_panel.toml index 53f6da1..1089624 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -11,4 +11,4 @@ services = ["__APP__-jicofo","__APP__-videobridge"] bind = "null" ask.en = "Max memory to use for VM" type = "number" - help = "One user consume about 1,5 Mib memory, for example if plan to have max 50 simultaneous users this parameter should be set to 75 mb" + help = "One user consume about 1,5 Mib memory ,with no user jitsi consume 120 MiB. For example if plan to have max 50 simultaneous users this parameter should be set to 200 mb" From f4950415204dc1d2c8264904547dc55b8fc0d83b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 16 Apr 2022 18:43:25 +0000 Subject: [PATCH 80/81] Auto-update README --- README.md | 12 ++++-------- README_fr.md | 10 +++------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 4f5b629..a962331 100644 --- a/README.md +++ b/README.md @@ -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. -**Shipped version:** 1.0.5913~ynh2 +**Shipped version:** 1.0.5913~ynh3 **Demo:** https://meet.jit.si/ @@ -33,12 +33,8 @@ Jitsi Meet is a libre software (Apache) WebRTC JavaScript app that uses Jitsi Vi 1. **Jitsi** requires a dedicated **root domain**, eg. jitsi.domain.tld 2. **Jitsi** requires the ports TCP/4443 and UDP/10000 to be forwarded to your YunoHost (The same way you forwarded 80 (HTTP), 443 (HTTPS), etc... https://yunohost.org/#/isp_box_config) 3. **Jitsi** will stop and disable Metronome XMPP. -4. LDAP authentication is activated, only authenticated users can create new conference rooms. Whenever a new room is about to be created, Jitsi Meet will prompt for a user name and password. After the room is created, others will be able to join from anonymous domain. -5. **Jitsi** is configured for to user 200MiB memory (next to 50 simultaneus users), this number can be increase going to the Yunohost config panel -5. **Jitsi** is compatible with armhf architecture, it was tested on odroid xu4 and hc1. - -## known bug -- if a second user join before the first user declared himself as moderator video and sound should never appear, reload page should correct the problem +4. LDAP authentication is activated, only authenticated users to create new conference rooms. Whenever a new room is about to be created, Jitsi Meet will prompt for a user name and password. After the room is created, others will be able to join from anonymous domain. +5. **Jitsi** is configured for 50 users maximum, this number can be increase going to the Yunohost config panel ## Documentation and resources @@ -59,4 +55,4 @@ or sudo yunohost app upgrade jitsi -u https://github.com/YunoHost-Apps/jitsi_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 2a46a90..b86db42 100644 --- a/README_fr.md +++ b/README_fr.md @@ -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. -**Version incluse :** 1.0.5913~ynh2 +**Version incluse :** 1.0.5913~ynh3 **Démo :** https://meet.jit.si/ @@ -30,11 +30,7 @@ Jitsi Meet est un logiciel libre (Apache) dont Jitsi Videobridge, avec WebRTC Ja 2. **Jitsi** demande que les ports TCP/4443 et UDP/10000 soient routés vers votre YunoHost (De la même manière que le sont les ports 80 (HTTP), 443 (HTTPS), etc... https://yunohost.org/#/isp_box_config) 3. **Jitsi** va arréter et désactiver le service XMPP Metronome. 4. L'authentification LDAP est activée, seuls les utilisateurs authentifiés peuvent créer de nouvelles salles de conférence. Chaque fois qu'une nouvelle salle est sur le point d'être créée, Jitsi Meet vous demandera un nom d'utilisateur et un mot de passe. Une fois la salle créée, d'autres personnes pourront la rejoindre à partir d'un domaine anonyme. -5. **Jitsi** est configuré pour utiliser 200MiB (equivalent a 50 utilisateurs maximum), ce nombre peut être augmenté en allant dans le panneau de configuration Yunohost -6. **Jitsi** est compatible avec l'architecture armhf (testé sur odroid XU4 et HC1) - -## Bugs connus -- si un second utilisateur rejoins le salon avant que le premié ne se soit déclaré comme modérateur, il risque de ne pas y avoir de partage de video et d'audio. Un rechargement de la page devrait suffir apres que le modérateur se soit identifé. +5. **Jitsi** est configuré pour 50 utilisateurs maximum, ce nombre peut être augmenté en allant dans le panneau de configuration Yunohost ## Documentations et ressources @@ -55,4 +51,4 @@ ou sudo yunohost app upgrade jitsi -u https://github.com/YunoHost-Apps/jitsi_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file From 400cdea145da60c44c1a1749a58a519c3cb153b7 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 17 Apr 2022 13:33:32 +0200 Subject: [PATCH 81/81] Add key --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index f301ad2..80e81fe 100644 --- a/scripts/install +++ b/scripts/install @@ -102,7 +102,7 @@ ynh_install_app_dependencies $pkg_dependencies if [ $YNH_ARCH == "armhf" ] then ynh_script_progression --message="Installing specific arm dependencies..." - ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security stretch/updates main" --package="$pkg_extra_depedencies_arm" + ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security stretch/updates main" --package="$pkg_extra_depedencies_arm" --key="https://ftp-master.debian.org/keys/archive-key-9-security.asc" fi diff --git a/scripts/upgrade b/scripts/upgrade index 0cf8379..1480702 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -148,7 +148,7 @@ ynh_install_app_dependencies $pkg_dependencies if [ $YNH_ARCH == "armhf" ] then ynh_script_progression --message="Installing specific arm dependencies..." - ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security stretch/updates main" --package="$pkg_extra_depedencies_arm" + ynh_install_extra_app_dependencies --repo="deb http://security.debian.org/debian-security stretch/updates main" --package="$pkg_extra_depedencies_arm" --key="https://ftp-master.debian.org/keys/archive-key-9-security.asc" fi if ! yunohost app list | grep -q "prosody"