diff --git a/check_process b/check_process index 5482428..7d97801 100755 --- a/check_process +++ b/check_process @@ -16,7 +16,6 @@ #upgrade=1 from_commit=CommitHash backup_restore=1 multi_instance=0 - port_already_use=0 change_url=1 ;;; Options Email= 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/armv7.src b/conf/armhf.src similarity index 100% rename from conf/armv7.src rename to conf/armhf.src diff --git a/conf/nginx.conf b/conf/nginx.conf index 4575d7b..c8cd24c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,9 +1,4 @@ location __PATH__/ { - - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } proxy_pass http://127.0.0.1:__PORT__; proxy_redirect off; diff --git a/manifest.json b/manifest.json index d0da57b..c9b3f94 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "email": "liberodark@gmail.com" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index f15ea3d..2641f9c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -18,28 +18,3 @@ pkg_dependencies="python3-bcrypt" #================================================= # 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="armv7" - elif [ -n "$(uname -m | grep armv6)" ]; then - architecture="armv6" - elif [ -n "$(uname -m | grep armv5)" ]; then - architecture="armv5" - else - architecture="unknown" - fi - echo $architecture -} diff --git a/scripts/upgrade b/scripts/upgrade index 8e09037..30fb313 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,7 +23,7 @@ password=$(ynh_app_setting_get --app=$app --key=password) final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) adguard_port=$(ynh_app_setting_get --app=$app --key=adguard_port) -architecture=$(ynh_detect_arch) +architecture=$YNH_ARCH #================================================= # CHECK VERSION