From 734ce03fdd9d556410893420c258951e41075e07 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 22 Nov 2021 10:26:11 +0100 Subject: [PATCH 1/3] 4.3 --- .github/workflows/updater.sh | 4 ++-- conf/{x86-64.src => amd64.src} | 0 conf/{arm7.src => armhf.src} | 0 conf/nginx.conf | 5 ----- manifest.json | 2 +- scripts/_common.sh | 20 -------------------- scripts/install | 2 +- scripts/upgrade | 2 +- 8 files changed, 5 insertions(+), 30 deletions(-) rename conf/{x86-64.src => amd64.src} (100%) rename conf/{arm7.src => armhf.src} (100%) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 923b189..68e77f5 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -64,10 +64,10 @@ echo "Handling asset at $asset_url" # Leave $src empty to ignore the asset case $asset_url in "owncast-"*"-linux-64bit.zip"*) - src="x86-64" + src="amd64" ;; "owncast-"*"-linux-arm7.zip"*) - src="arm7" + src="armhf" ;; "owncast-"*"-linux-arm64.zip"*) src="arm64" diff --git a/conf/x86-64.src b/conf/amd64.src similarity index 100% rename from conf/x86-64.src rename to conf/amd64.src diff --git a/conf/arm7.src b/conf/armhf.src similarity index 100% rename from conf/arm7.src rename to conf/armhf.src diff --git a/conf/nginx.conf b/conf/nginx.conf index c9748e3..63b9113 100755 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,10 +1,5 @@ location / { - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - proxy_set_header Host $host; proxy_set_header X-Forwarded-Host $host; proxy_set_header X-Forwarded-Server $host; diff --git a/manifest.json b/manifest.json index e7047b4..64f3be2 100755 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 0504661..a40bad9 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -19,23 +19,3 @@ pkg_dependencies="ffmpeg" # FUTURE OFFICIAL HELPERS #================================================= -# Check the architecture -# -# example: architecture=$(ynh_detect_arch) -# -# usage: ynh_detect_arch -# -# Requires YunoHost version 2.2.4 or higher. -ynh_detect_arch(){ - local architecture - if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then - architecture="arm64" - elif [ -n "$(uname -m | grep 64)" ]; then - architecture="x86-64" - elif [ -n "$(uname -m | grep armv7)" ]; then - architecture="arm7" - else - architecture="unknown" - fi - echo $architecture -} diff --git a/scripts/install b/scripts/install index 817c86c..7ad885b 100755 --- a/scripts/install +++ b/scripts/install @@ -23,7 +23,7 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC -architecture=$(ynh_detect_arch) +architecture=$YNH_ARCH app=$YNH_APP_INSTANCE_NAME diff --git a/scripts/upgrade b/scripts/upgrade index b455253..493d8ac 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,7 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) stream_port=$(ynh_app_setting_get --app=$app --key=stream_port) -architecture=$(ynh_detect_arch) +architecture=$YNH_ARCH port=$(ynh_app_setting_get --app=$app --key=port) #================================================= From 92820bef41ecfaf86a7aef41a762d4d8c421b368 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 30 Nov 2021 19:22:33 +0100 Subject: [PATCH 2/3] Bump package version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 64f3be2..e33bb88 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Self-hosted live video and web chat server for use with existing broadcasting software", "fr": "Serveur de vidéo en direct et de chat Web auto-hébergé à utiliser avec un logiciel de diffusion" }, - "version": "0.0.10~ynh1", + "version": "0.0.10~ynh2", "url": "https://owncast.online/", "upstream": { "license": "MIT", From 87081b0198a696b6f0ccafe79455ccabb323170f Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 30 Nov 2021 18:22:36 +0000 Subject: [PATCH 3/3] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0ae870e..cd1bf33 100755 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Owncast is an open source, self-hosted, decentralized, single user live streaming and chat server for running your own live streams similar in style to the large mainstream options. It offers complete ownership over your content, interface, moderation and audience. -**Shipped version:** 0.0.10~ynh1 +**Shipped version:** 0.0.10~ynh2 **Demo:** https://watch.owncast.online/ diff --git a/README_fr.md b/README_fr.md index 6d32f33..7009143 100755 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Owncast est un serveur de diffusion en direct et de chat open source, auto-hébergé, décentralisé et à utilisateur unique pour exécuter vos propres diffusions en direct dans un style similaire aux grandes options grand public. Il offre une propriété complète sur votre contenu, votre interface, votre modération et votre audience. -**Version incluse :** 0.0.10~ynh1 +**Version incluse :** 0.0.10~ynh2 **Démo :** https://watch.owncast.online/