diff --git a/conf/nginx.conf b/conf/nginx.conf index 5e92ed0..a16d24a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -12,6 +12,7 @@ location __PATH__/ { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; + # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; more_clear_input_headers 'Accept-Encoding'; diff --git a/manifest.toml b/manifest.toml index 03b087f..e9e04fe 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "JupyterLab" description.en = "Code console environment for running Python code interactively" description.fr = "Console de code pour exécuter du code Python de manière interactive" -version = "3.6.1~ynh3" +version = "4.0.2~ynh1" maintainers = ["kay0u"] @@ -17,7 +17,7 @@ admindoc = "https://jupyterlab.readthedocs.io/en/stable/" code = "https://github.com/jupyterhub/jupyterhub" [integration] -yunohost = ">= 11.1.11" +yunohost = ">= 11.1.20" architectures = "all" multi_instance = true ldap = true @@ -53,8 +53,8 @@ ram.runtime = "50M" type = "boolean" default = true - [resources] + [resources.ports] main.default = 8080 hub.default = 8081 @@ -69,7 +69,6 @@ ram.runtime = "50M" [resources.apt] packages = "python3-dev python3-pip" - extras.yarn.repo = "deb https://dl.yarnpkg.com/debian/ stable main" extras.yarn.key = "https://dl.yarnpkg.com/debian/pubkey.gpg" extras.yarn.packages = "yarn" diff --git a/scripts/_common.sh b/scripts/_common.sh index 4bcc8e5..42c8697 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,9 +4,9 @@ # COMMON VARIABLES #================================================= -nodejs_version="16" +nodejs_version="18" -jupyterlab_version="3.6.1" +jupyterlab_version="4.0.2" #================================================= # PERSONAL HELPERS diff --git a/scripts/upgrade b/scripts/upgrade index 7dbf6c4..c1c94e6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -50,7 +50,6 @@ then popd fi - #================================================= # REAPPLY SYSTEM CONFIGURATIONS #=================================================