Merge pull request #20 from YunoHost-Apps/testing

Testing

.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"

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/
 

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/
 

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;

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",
@@ -21,7 +21,7 @@
         "email": ""
     },
     "requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": false,
     "services": [

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
-}

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
 

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)
 
 #=================================================