From 4d16e0de735db727fd869166cef9097f5194946d Mon Sep 17 00:00:00 2001 From: Jonathan Felder Date: Mon, 8 Jul 2024 17:20:11 -0700 Subject: [PATCH] [DH-305] ensure Qt export options are disabled and webpdf is enabled --- deployments/astro/config/common.yaml | 3 +-- deployments/biology/config/common.yaml | 2 +- deployments/data100/config/common.yaml | 2 +- deployments/data101/config/common.yaml | 7 +++++++ deployments/data102/config/common.yaml | 7 +++++++ deployments/data8/config/common.yaml | 3 +-- deployments/datahub/config/common.yaml | 3 +-- deployments/dlab/config/common.yaml | 6 ++++++ deployments/eecs/config/common.yaml | 6 ++++++ deployments/ischool/config/common.yaml | 3 +-- deployments/julia/config/common.yaml | 3 +-- deployments/prob140/config/common.yaml | 4 ++-- deployments/publichealth/config/common.yaml | 3 +-- deployments/r/config/common.yaml | 3 +-- 14 files changed, 37 insertions(+), 18 deletions(-) diff --git a/deployments/astro/config/common.yaml b/deployments/astro/config/common.yaml index 30ed02207..47524c300 100644 --- a/deployments/astro/config/common.yaml +++ b/deployments/astro/config/common.yaml @@ -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" diff --git a/deployments/biology/config/common.yaml b/deployments/biology/config/common.yaml index c9c5afb92..317794daa 100644 --- a/deployments/biology/config/common.yaml +++ b/deployments/biology/config/common.yaml @@ -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: | diff --git a/deployments/data100/config/common.yaml b/deployments/data100/config/common.yaml index 4b71ba79a..8f92b32ad 100644 --- a/deployments/data100/config/common.yaml +++ b/deployments/data100/config/common.yaml @@ -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 diff --git a/deployments/data101/config/common.yaml b/deployments/data101/config/common.yaml index 176ba5395..7e5a92d33 100644 --- a/deployments/data101/config/common.yaml +++ b/deployments/data101/config/common.yaml @@ -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 diff --git a/deployments/data102/config/common.yaml b/deployments/data102/config/common.yaml index e5a281f62..4c47aa5bc 100644 --- a/deployments/data102/config/common.yaml +++ b/deployments/data102/config/common.yaml @@ -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 diff --git a/deployments/data8/config/common.yaml b/deployments/data8/config/common.yaml index 2c089af06..2b2864063 100644 --- a/deployments/data8/config/common.yaml +++ b/deployments/data8/config/common.yaml @@ -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" diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml index 5683e39bc..39df7952c 100644 --- a/deployments/datahub/config/common.yaml +++ b/deployments/datahub/config/common.yaml @@ -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 diff --git a/deployments/dlab/config/common.yaml b/deployments/dlab/config/common.yaml index cd9cd5bb6..d530b9954 100644 --- a/deployments/dlab/config/common.yaml +++ b/deployments/dlab/config/common.yaml @@ -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: diff --git a/deployments/eecs/config/common.yaml b/deployments/eecs/config/common.yaml index ad7c2f9be..ac7e30455 100644 --- a/deployments/eecs/config/common.yaml +++ b/deployments/eecs/config/common.yaml @@ -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 diff --git a/deployments/ischool/config/common.yaml b/deployments/ischool/config/common.yaml index 7591d4be6..71384a795 100644 --- a/deployments/ischool/config/common.yaml +++ b/deployments/ischool/config/common.yaml @@ -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" diff --git a/deployments/julia/config/common.yaml b/deployments/julia/config/common.yaml index bbfaf31da..498b399a4 100644 --- a/deployments/julia/config/common.yaml +++ b/deployments/julia/config/common.yaml @@ -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 diff --git a/deployments/prob140/config/common.yaml b/deployments/prob140/config/common.yaml index 0a7b1bc14..07c6b3953 100644 --- a/deployments/prob140/config/common.yaml +++ b/deployments/prob140/config/common.yaml @@ -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" diff --git a/deployments/publichealth/config/common.yaml b/deployments/publichealth/config/common.yaml index 8719e9c1d..b28fb0235 100644 --- a/deployments/publichealth/config/common.yaml +++ b/deployments/publichealth/config/common.yaml @@ -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" diff --git a/deployments/r/config/common.yaml b/deployments/r/config/common.yaml index 51cb0040b..f06b714b0 100644 --- a/deployments/r/config/common.yaml +++ b/deployments/r/config/common.yaml @@ -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.