diff --git a/README.md b/README.md index d15aed7..49eec21 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Galène is a videoconferencing server that is easy to deploy (just copy a few files and run the binary) and that requires moderate server resources. It was originally designed for lectures and conferences (where a single speaker streams audio and video to hundreds or thousands of users), but later evolved to be useful for student practicals (where users are divided into many small groups), and meetings (where a few dozen users interact with each other). -**Shipped version:** 0.2 +**Shipped version:** 0.3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index cb74052..f15b690 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Galène est un serveur de visioconférence facile à déployer (il suffit de copier quelques fichiers et d'exécuter le binaire) et qui nécessite des ressources serveur modérées. Il a été conçu à l'origine pour les conférences (où un seul orateur diffuse l'audio et la vidéo à des centaines ou des milliers d'utilisateurs), mais a ensuite évolué pour être utile pour les travaux pratiques des étudiants (où les utilisateurs sont divisés en plusieurs petits groupes) et les réunions (où un quelques dizaines d'utilisateurs interagissent les uns avec les autres). -**Version incluse :** 0.2 +**Version incluse :** 0.3 ## Captures d'écran diff --git a/conf/386.src b/conf/386.src new file mode 100644 index 0000000..4b9876f --- /dev/null +++ b/conf/386.src @@ -0,0 +1,7 @@ +SOURCE_URL=https://github.com/YunoHost-Apps/galene_ynh/releases/download/v0.3/galene_0.3_Linux_386.tar.gz +SOURCE_SUM=7264f573bc82185c88def851a70b1fe2b6f22c338ccf1e9c8fd9a80050c4be7e +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=tar.gz +SOURCE_IN_SUBDIR=true +SOURCE_FILENAME= +SOURCE_EXTRACT=true \ No newline at end of file diff --git a/conf/x86-64.src b/conf/amd64.src similarity index 58% rename from conf/x86-64.src rename to conf/amd64.src index 1ae76ef..f42530c 100644 --- a/conf/x86-64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/galene_ynh/releases/download/v0.2/galene_0.2_Linux_x86_64.tar.gz -SOURCE_SUM=6676942015ada1ddf5e136dfa7cd0af883ac988f117c88df64b2cb0db75b1d7d +SOURCE_URL=https://github.com/YunoHost-Apps/galene_ynh/releases/download/v0.3/galene_0.3_Linux_amd64.tar.gz +SOURCE_SUM=0044483c52c392059463147df3762dd832350a5de6791e1fb4cb067cc39f880b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/arm.src b/conf/arm6.src similarity index 58% rename from conf/arm.src rename to conf/arm6.src index 6fd73a2..4024108 100644 --- a/conf/arm.src +++ b/conf/arm6.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/galene_ynh/releases/download/v0.2/galene_0.2_Linux_arm.tar.gz -SOURCE_SUM=f1c498b1897e548a69e56392a63e5a20c72a2115a8c6112725a9005ee55c0fae +SOURCE_URL=https://github.com/YunoHost-Apps/galene_ynh/releases/download/v0.3/galene_0.3_Linux_arm6.tar.gz +SOURCE_SUM=230bb8c9649138171f44fa299cbaccac07ecc47e800e61194528e6dd044f37fa SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/arm64.src b/conf/arm64.src index cfe42c2..fef4309 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/galene_ynh/releases/download/v0.2/galene_0.2_Linux_arm64.tar.gz -SOURCE_SUM=b7d045f3df8268dab52b307152cb88be79e50b5363c1a98ca20def9021d16541 +SOURCE_URL=https://github.com/YunoHost-Apps/galene_ynh/releases/download/v0.3/galene_0.3_Linux_arm64.tar.gz +SOURCE_SUM=7739c2e507e8a7deb8ea9f4a8de8a945d8ca8630a67c5c29851680a2cb208cc0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/arm7.src b/conf/arm7.src new file mode 100644 index 0000000..37b8792 --- /dev/null +++ b/conf/arm7.src @@ -0,0 +1,7 @@ +SOURCE_URL=https://github.com/YunoHost-Apps/galene_ynh/releases/download/v0.3/galene_0.3_Linux_arm7.tar.gz +SOURCE_SUM=5f81a71faf9450067eab29e57509258a23540374e3c2eb7ee71e616d87e3a10a +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=tar.gz +SOURCE_IN_SUBDIR=true +SOURCE_FILENAME= +SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 811b527..8df1672 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Videoconferencing server that is easy to deploy", "fr": "Serveur de visioconférence facile à déployer" }, - "version": "0.2~ynh6", + "version": "0.3~ynh1", "url": "https://galene.org/", "license": "MIT", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index fb6b70c..7718614 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -171,13 +171,13 @@ ynh_detect_arch(){ if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then architecture="arm64" elif [ -n "$(uname -m | grep 64)" ]; then - architecture="x86-64" + architecture="amd64" + elif [ -n "$(uname -m | grep 86)" ]; then + architecture="386" elif [ -n "$(uname -m | grep armv7)" ]; then - architecture="arm" + architecture="arm7" elif [ -n "$(uname -m | grep armv6)" ]; then - architecture="arm" - elif [ -n "$(uname -m | grep armv5)" ]; then - architecture="arm" + architecture="arm6" else architecture="unknown" fi diff --git a/scripts/install b/scripts/install index 16b36a3..4c74dcb 100755 --- a/scripts/install +++ b/scripts/install @@ -115,14 +115,24 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" + +#================================================= +# CREATE DATA FOLDER +#================================================= + +# Define app's data directory +data="$final_path/data" +# Create data folder +mkdir -p "$data" + #================================================= # CREATE A SERVER CERTIFICATE #================================================= -pushd "$final_path" - ynh_exec_warn_less openssl req -newkey rsa:2048 -nodes -keyout data/key.pem -x509 -days 365 -out data/cert.pem \ +pushd "$final_path/data" + ynh_exec_warn_less openssl req -newkey rsa:2048 -nodes -keyout key.pem -x509 -days 365 -out cert.pem \ -subj "/C=/ST=/L=/O=/OU=/CN=/emailAddress=" - chmod 640 data/{key.pem,cert.pem} + chmod 640 {key.pem,cert.pem} popd #================================================= @@ -195,6 +205,15 @@ fi ynh_store_file_checksum --file="$coturn_config_path" +#================================================= +# CREATE GROUPS FOLDER +#================================================= + +# Define app's groups directory +groups="$final_path/groups" +# Create groups folder +mkdir -p "$groups" + #================================================= # MODIFY A CONFIG FILE #=================================================