Merge pull request #19 from YunoHost-Apps/4.3

4.3

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

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

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