Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DH-305] ensure Qt export options are disabled and webpdf is enabled #5846

Merged
merged 1 commit into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions deployments/astro/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,12 @@ jupyterhub:

singleuser:
extraFiles:
# DH-216
# DH-305
remove-exporters:
mountPath: /etc/jupyter/jupyter_notebook_config.py
stringData: |
c.QtPDFExporter.enabled = False
c.QtPNGExporter.enabled = False
c.WebPDFExporter.enabled = False
extraEnv:
# Unset NotebookApp from hub/values. Necessary for recent lab versions.
JUPYTERHUB_SINGLEUSER_APP: "jupyter_server.serverapp.ServerApp"
Expand Down
2 changes: 1 addition & 1 deletion deployments/biology/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ jupyterhub:
# Unset NotebookApp from hub/values. Necessary for recent lab versions.
JUPYTERHUB_SINGLEUSER_APP: "jupyter_server.serverapp.ServerApp"
extraFiles:
# DH-305
remove-exporters:
mountPath: /etc/jupyter/jupyter_notebook_config.py
stringData: |
c.QtPDFExporter.enabled = False
c.QtPNGExporter.enabled = False
c.WebPDFExporter.enabled = False
git-credential-helper:
mountPath: /etc/gitconfig
stringData: |
Expand Down
2 changes: 1 addition & 1 deletion deployments/data100/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ jupyterhub:

singleuser:
extraFiles:
# DH-305
remove-exporters:
mountPath: /etc/jupyter/jupyter_notebook_config.py
stringData: |
c.QtPDFExporter.enabled = False
c.QtPNGExporter.enabled = False
c.WebPDFExporter.disable_sandbox = True
defaultUrl: "/lab"
extraEnv:
GH_SCOPED_CREDS_CLIENT_ID: Iv1.f79b4903c7ea2847
Expand Down
7 changes: 7 additions & 0 deletions deployments/data101/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,13 @@ jupyterhub:
hub.jupyter.org/pool-name: core-pool-2024-05-08

singleuser:
extraFiles:
# DH-305
remove-exporters:
mountPath: /etc/jupyter/jupyter_notebook_config.py
stringData: |
c.QtPDFExporter.enabled = False
c.QtPNGExporter.enabled = False
extraContainers:
- name: mongo
image: mongo:5.0.11
Expand Down
7 changes: 7 additions & 0 deletions deployments/data102/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@ jupyterhub:
# - course::1532439::enrollment_type::ta

singleuser:
extraFiles:
# DH-305
remove-exporters:
mountPath: /etc/jupyter/jupyter_notebook_config.py
stringData: |
c.QtPDFExporter.enabled = False
c.QtPNGExporter.enabled = False
defaultUrl: "/lab"
extraEnv:
GH_SCOPED_CREDS_CLIENT_ID: Iv1.f769e27a8207e5c9
Expand Down
3 changes: 1 addition & 2 deletions deployments/data8/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,12 @@ jupyterhub:

singleuser:
extraFiles:
# DH-216 Removing QtPDF, QtPNG as per Data 8 GSI inputs
# DH-305
remove-exporters:
mountPath: /etc/jupyter/jupyter_notebook_config.py
stringData: |
c.QtPDFExporter.enabled = False
c.QtPNGExporter.enabled = False
c.WebPDFExporter.enabled = False
extraEnv:
# Unset NotebookApp from hub/values. Necessary for recent lab versions.
JUPYTERHUB_SINGLEUSER_APP: "jupyter_server.serverapp.ServerApp"
Expand Down
3 changes: 1 addition & 2 deletions deployments/datahub/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,11 @@ jupyterhub:
mountPath: /home/jovyan/.rstudio
subPath: '{username}/.datahub-rstudio'
extraFiles:
# DH-164, DH-262
# DH-305
remove-exporters:
mountPath: /etc/jupyter/jupyter_notebook_config.py
stringData: |
c.QtPDFExporter.enabled = False
c.PDFExporter.enabled = True
c.QtPNGExporter.enabled = False
memory:
guarantee: 512M
Expand Down
6 changes: 6 additions & 0 deletions deployments/dlab/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ jupyterhub:
GH_SCOPED_CREDS_CLIENT_ID: Iv1.9b3b48abeb673056
GH_SCOPED_CREDS_APP_URL: https://github.com/apps/dlab-berkeley-datahub-access
extraFiles:
# DH-305
remove-exporters:
mountPath: /etc/jupyter/jupyter_notebook_config.py
stringData: |
c.QtPDFExporter.enabled = False
c.QtPNGExporter.enabled = False
# Set gh-scoped-creds vars for RStudio too. RStudio drops most vars
# including those we set in extraEnv.
gh-scoped-creds:
Expand Down
6 changes: 6 additions & 0 deletions deployments/eecs/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@ jupyterhub:
JUPYTERHUB_SINGLEUSER_APP: "jupyter_server.serverapp.ServerApp"
defaultUrl: "/lab"
extraFiles:
# DH-305
remove-exporters:
mountPath: /etc/jupyter/jupyter_notebook_config.py
stringData: |
c.QtPDFExporter.enabled = False
c.QtPNGExporter.enabled = False
git-credential-helper:
# Move back to /etc/gitconfig if https://github.com/conda-forge/git-feedstock/issues/113
# ever gets fixed, or if we start using git from apt again
Expand Down
3 changes: 1 addition & 2 deletions deployments/ischool/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,12 @@ jupyterhub:

singleuser:
extraFiles:
# DH-216
# DH-305
remove-exporters:
mountPath: /etc/jupyter/jupyter_notebook_config.py
stringData: |
c.QtPDFExporter.enabled = False
c.QtPNGExporter.enabled = False
c.WebPDFExporter.enabled = False
extraEnv:
# Unset NotebookApp from hub/values. Necessary for recent lab versions.
JUPYTERHUB_SINGLEUSER_APP: "jupyter_server.serverapp.ServerApp"
Expand Down
3 changes: 1 addition & 2 deletions deployments/julia/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,12 @@ jupyterhub:
- course::1524699::group::all-admins
singleuser:
extraFiles:
# DH-216
# DH-305
remove-exporters:
mountPath: /etc/jupyter/jupyter_notebook_config.py
stringData: |
c.QtPDFExporter.enabled = False
c.QtPNGExporter.enabled = False
c.WebPDFExporter.enabled = False
extraEnv:
# Tell code where to display GUIs
# The VNC /desktop link must be opened already for this to work
Expand Down
4 changes: 2 additions & 2 deletions deployments/prob140/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ jupyterhub:

singleuser:
extraFiles:
# DH-216
# DH-305
remove-exporters:
mountPath: /etc/jupyter/jupyter_notebook_config.py
stringData: |
c.QtPDFExporter.enabled = False
c.WebPDFExporter.enabled = False
c.QtPNGExporter.enabled = False
extraEnv:
# Unset NotebookApp from hub/values. Necessary for recent lab versions.
JUPYTERHUB_SINGLEUSER_APP: "jupyter_server.serverapp.ServerApp"
Expand Down
3 changes: 1 addition & 2 deletions deployments/publichealth/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,12 @@ jupyterhub:

singleuser:
extraFiles:
# DH-216
# DH-305
remove-exporters:
mountPath: /etc/jupyter/jupyter_notebook_config.py
stringData: |
c.QtPDFExporter.enabled = False
c.QtPNGExporter.enabled = False
c.WebPDFExporter.enabled = False
extraEnv:
# Unset NotebookApp from hub/values. Necessary for recent lab versions.
JUPYTERHUB_SINGLEUSER_APP: "jupyter_server.serverapp.ServerApp"
Expand Down
3 changes: 1 addition & 2 deletions deployments/r/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,11 @@ jupyterhub:

singleuser:
extraFiles:
# DH-216, re-add PDFExporter DH-262
# DH-305
remove-exporters:
mountPath: /etc/jupyter/jupyter_notebook_config.py
stringData: |
c.QtPDFExporter.enabled = False
c.PDFExporter.enabled = True
c.QtPNGExporter.enabled = False
extraEnv:
# Unset NotebookApp from hub/values. Necessary for recent lab versions.
Expand Down
Loading