hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-18 15:33:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

make sure ssl/subdomain are covered both for both mixin and serverextension

Browse Source
This commit is contained in:
Min RK
2023-02-16 14:26:05 +01:00
parent 18adfbbf30
commit e9fd6e1c32
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/test.yml vendored
View File

@@ -86,14 +86,20 @@ jobs:
db: postgres db: postgres
- python: "3.11" - python: "3.11"
subdomain: subdomain subdomain: subdomain
serverextension: serverextension
- python: "3.11" - python: "3.11"
ssl: ssl ssl: ssl
serverextension: serverextension
- python: "3.11"
subdomain: subdomain
noextension: noextension
- python: "3.11"
ssl: ssl
noextension: noextension
- python: "3.11" - python: "3.11"
selenium: selenium selenium: selenium
- python: "3.11" - python: "3.11"
main_dependencies: main_dependencies main_dependencies: main_dependencies
- python: "3.10"
serverextension: serverextension
steps: steps:
# NOTE: In GitHub workflows, environment variables are set by writing # NOTE: In GitHub workflows, environment variables are set by writing
@@ -119,6 +125,8 @@ jobs:
fi fi
if [ "${{ matrix.serverextension }}" != "" ]; then if [ "${{ matrix.serverextension }}" != "" ]; then
echo "JUPYTERHUB_SINGLEUSER_EXTENSION=1" >> $GITHUB_ENV echo "JUPYTERHUB_SINGLEUSER_EXTENSION=1" >> $GITHUB_ENV
elif [ "${{ matrix.noextension }}" != "" ]; then
echo "JUPYTERHUB_SINGLEUSER_EXTENSION=0" >> $GITHUB_ENV
fi fi
- uses: actions/checkout@v3 - uses: actions/checkout@v3
# NOTE: actions/setup-node@v3 make use of a cache within the GitHub base # NOTE: actions/setup-node@v3 make use of a cache within the GitHub base

2
jupyterhub/singleuser/extension.py
View File

@@ -502,7 +502,7 @@ class JupyterHubSingleUser(ExtensionApp):
# to make sure it has the desired effect # to make sure it has the desired effect
cfg.default_url = self.default_url = self.get_default_url() cfg.default_url = self.default_url = self.get_default_url()
# load SSL configuration # load internal SSL configuration
cfg.keyfile = os.environ.get('JUPYTERHUB_SSL_KEYFILE') or '' cfg.keyfile = os.environ.get('JUPYTERHUB_SSL_KEYFILE') or ''
cfg.certfile = os.environ.get('JUPYTERHUB_SSL_CERTFILE') or '' cfg.certfile = os.environ.get('JUPYTERHUB_SSL_CERTFILE') or ''
cfg.client_ca = os.environ.get('JUPYTERHUB_SSL_CLIENT_CA') or '' cfg.client_ca = os.environ.get('JUPYTERHUB_SSL_CLIENT_CA') or ''