From 8306bf10adccc244f6e2be76b64dc0717fa64b81 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 30 Nov 2021 11:37:52 +0100 Subject: [PATCH] 4.3 --- conf/app.src | 1 - conf/nginx.conf | 3 --- scripts/_common.sh | 4 ++-- scripts/restore | 3 +-- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/conf/app.src b/conf/app.src index 70ce977..41733d4 100644 --- a/conf/app.src +++ b/conf/app.src @@ -3,5 +3,4 @@ SOURCE_SUM=dd7357529826beb071a86e6f76bc2eb99b0d6481a71566db1cb2f6cf8a4a6305 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.xz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= SOURCE_EXTRACT=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 7acd1e7..fab5c24 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -26,9 +26,6 @@ location = /api/v1/videos/upload-resumable { } location / { - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } try_files /dev/null @api; diff --git a/scripts/_common.sh b/scripts/_common.sh index d6aa49f..5e43880 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,9 +5,9 @@ #================================================= # dependencies used by the app -pkg_dependencies="ffmpeg postgresql postgresql-contrib openssl g++ redis-server redis-tools mailutils apt-transport-https" +pkg_dependencies="ffmpeg postgresql postgresql-contrib openssl g++ mailutils apt-transport-https" -NODEJS_VERSION=14 +NODEJS_VERSION=16 #================================================= # PERSONAL HELPERS diff --git a/scripts/restore b/scripts/restore index e353cd5..5fbf9b6 100644 --- a/scripts/restore +++ b/scripts/restore @@ -42,8 +42,7 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir) #================================================= ynh_script_progression --message="Validating restoration parameters..." -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS