Allow database user to be specified

- Allow user to change database username by setting JUPYTERHUB_DATABASE_USER
- Still default to 'jupyterhub' as standard username if not set

Author: gmfrasca

jupyterhub_config.py

@@ -183,7 +183,8 @@ def resolve_image_name(name):
     c.JupyterHub.cookie_secret_file = '/opt/app-root/data/cookie_secret'
 
 if os.environ.get('JUPYTERHUB_DATABASE_PASSWORD'):
-    c.JupyterHub.db_url = 'postgresql://jupyterhub:%s@%s:5432/%s' % (
+    c.JupyterHub.db_url = 'postgresql://%s:%s@%s:5432/%s' % (
+            os.environ.get('JUPYTERHUB_DATABASE_USER', 'jupyterhub'),
             os.environ['JUPYTERHUB_DATABASE_PASSWORD'],
             os.environ['JUPYTERHUB_DATABASE_HOST'],
             os.environ.get('JUPYTERHUB_DATABASE_NAME', 'jupyterhub'))

scripts/wait-for-database

@@ -2,10 +2,11 @@
 
 set -x
 
+JUPYTERHUB_DATABASE_USER=${JUPYTERHUB_DATABASE_USER:-jupyterhub}
 JUPYTERHUB_DATABASE_NAME=${JUPYTERHUB_DATABASE_NAME:-jupyterhub}
 
 while true; do
-    psql "postgresql://jupyterhub:$JUPYTERHUB_DATABASE_PASSWORD@$JUPYTERHUB_DATABASE_HOST:5432/$JUPYTERHUB_DATABASE_NAME" -q -c 'SELECT 1'
+    psql "postgresql://$JUPYTERHUB_DATABASE_USER:$JUPYTERHUB_DATABASE_PASSWORD@$JUPYTERHUB_DATABASE_HOST:5432/$JUPYTERHUB_DATABASE_NAME" -q -c 'SELECT 1'
     if [ $? -eq 0 ]; then
         exit 0
     fi

templates/jupyterhub-deployer.json

@@ -178,6 +178,10 @@
                                     }
                                 },
                                 "env": [
+                                    {
+                                        "name": "JUPYTERHUB_DATABASE_USER",
+                                        "value": "jupyterhub"
+                                    },
                                     {
                                         "name": "JUPYTERHUB_DATABASE_PASSWORD",
                                         "value": "${DATABASE_PASSWORD}"
@@ -221,6 +225,10 @@
                                         "name": "JUPYTERHUB_NOTEBOOK_MEMORY",
                                         "value": "${NOTEBOOK_MEMORY}"
                                     },
+                                    {
+                                        "name": "JUPYTERHUB_DATABASE_USER",
+                                        "value": "jupyterhub"
+                                    },
                                     {
                                         "name": "JUPYTERHUB_DATABASE_PASSWORD",
                                         "value": "${DATABASE_PASSWORD}"

templates/jupyterhub-quickstart.json

@@ -255,6 +255,10 @@
                                     }
                                 },
                                 "env": [
+                                    {
+                                        "name": "JUPYTERHUB_DATABASE_USER",
+                                        "value": "jupyterhub"
+                                    },
                                     {
                                         "name": "JUPYTERHUB_DATABASE_PASSWORD",
                                         "value": "${DATABASE_PASSWORD}"
@@ -302,6 +306,10 @@
                                         "name": "JUPYTERHUB_NOTEBOOK_INTERFACE",
                                         "value": "${NOTEBOOK_INTERFACE}"
                                     },
+                                    {
+                                        "name": "JUPYTERHUB_DATABASE_USER",
+                                        "value": "jupyterhub"
+                                    },
                                     {
                                         "name": "JUPYTERHUB_DATABASE_PASSWORD",
                                         "value": "${DATABASE_PASSWORD}"

templates/jupyterhub-workspace.json

@@ -239,6 +239,10 @@
                                     }
                                 },
                                 "env": [
+                                    {
+                                        "name": "JUPYTERHUB_DATABASE_USER",
+                                        "value": "jupyterhub"
+                                    },
                                     {
                                         "name": "JUPYTERHUB_DATABASE_PASSWORD",
                                         "value": "${DATABASE_PASSWORD}"
@@ -302,6 +306,10 @@
                                         "name": "JUPYTERHUB_IDLE_TIMEOUT",
                                         "value": "${IDLE_TIMEOUT}"
                                     },
+                                    {
+                                        "name": "JUPYTERHUB_DATABASE_USER",
+                                        "value": "jupyterhub"
+                                    },
                                     {
                                         "name": "JUPYTERHUB_DATABASE_PASSWORD",
                                         "value": "${DATABASE_PASSWORD}"