diff --git a/README.md b/README.md index 3aa3a9e..16efd96 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Terminal over HTTP and HTTPS. WeTTy is an alternative to ajaxterm and anyterm but much better than them because WeTTy uses xterm.js which is a full fledged implementation of terminal emulation written entirely in JavaScript. WeTTy uses websockets rather then Ajax and hence better response time. -**Shipped version:** 2.1.1~ynh1 +**Shipped version:** 2.4.1~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 7a436cf..b00e2ef 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Terminal sur HTTP et HTTPS. WeTTy est une alternative à ajaxterm et anyterm mais bien meilleure qu'eux car WeTTy utilise xterm.js qui est une implémentation complète de l'émulation de terminal écrite entièrement en JavaScript. WeTTy utilise des websockets plutôt que Ajax et donc un meilleur temps de réponse. -**Version incluse :** 2.1.1~ynh1 +**Version incluse :** 2.4.1~ynh1 ## Captures d'écran diff --git a/check_process b/check_process index 33a066a..52d4668 100644 --- a/check_process +++ b/check_process @@ -17,7 +17,6 @@ upgrade=1 from_commit=e7ffa9512f59c8c2097512a4b6613524c5284e77 backup_restore=1 multi_instance=1 - port_already_use=0 change_url=1 ;;; Options Email= diff --git a/conf/app.src b/conf/app.src index 60c9304..b90acfc 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/butlerx/wetty/archive/v2.1.1.tar.gz -SOURCE_SUM=a1943d699b819828f503f327c7f9ec7bc2702aa05c72af6400f4feea64e7fc3a +SOURCE_URL=https://github.com/butlerx/wetty/archive/5e4e16026b33e5144c0e533516e1a839a33e77df.tar.gz +SOURCE_SUM=ca4af83e11e69863395c4255e465c63cc527be8d912591468a0ba399ef31edec SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index b37f382..057beb4 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,11 +1,6 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - # Internally redirect /wetty/ to /wetty because the app wants this # break tells nginx to continue processing the location block rewrite ^__PATH__/$ __PATH__ break; diff --git a/manifest.json b/manifest.json index 1cdb3d8..b2168f6 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Terminal in browser over HTTP/HTTPS. (Ajaxterm/Anyterm alternative)", "fr": "Un terminal dans le navigateur sur HTTP/HTTPS. (alternative à Ajaxterm/Anyterm)" }, - "version": "2.1.1~ynh1", + "version": "2.4.1~ynh1", "url": "https://github.com/butlerx/wetty/", "license": "MIT", "upstream": { @@ -23,7 +23,7 @@ "email": "salamandar@salamandar.fr" }, "requirements": { - "yunohost": ">= 4.1.0" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ @@ -33,8 +33,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", diff --git a/scripts/_common.sh b/scripts/_common.sh index 2a28ffc..3693f10 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,10 +4,7 @@ # COMMON VARIABLES #================================================= -# dependencies used by the app -# pkg_dependencies="" - -NODEJS_VERSION=14 +NODEJS_VERSION=16 #================================================= # PERSONAL HELPERS