diff --git a/images/logo.png b/images/logo.png new file mode 100644 index 0000000..27112c1 Binary files /dev/null and b/images/logo.png differ diff --git a/jupyterhub_config.py b/jupyterhub_config.py index 2e9fa27..2aa6bf4 100755 --- a/jupyterhub_config.py +++ b/jupyterhub_config.py @@ -201,19 +201,19 @@ for name in GROUP_MAP: whitelist.add(name) # Authenticate users with GitHub OAuth -# c.JupyterHub.authenticator_class = 'oauthenticator.GitHubOAuthenticator' -# c.GitHubOAuthenticator.oauth_callback_url = os.environ['OAUTH_CALLBACK_URL'] +c.JupyterHub.authenticator_class = 'oauthenticator.GitHubOAuthenticator' +c.GitHubOAuthenticator.oauth_callback_url = os.environ['OAUTH_CALLBACK_URL'] # Authenticate with thedataincubator/jupyterhub-hashauthenticator -c.JupyterHub.authenticator_class = 'hashauthenticator.HashAuthenticator' +##c.JupyterHub.authenticator_class = 'hashauthenticator.HashAuthenticator' # You can generate a good "secret key" by running `openssl rand -hex 32` in terminal. # it is recommended to do this from time-to-time to change passwords (including changing their length) -c.HashAuthenticator.secret_key = os.environ['HASH_SECRET_KEY'] # Defaults to '' -c.HashAuthenticator.password_length = int(os.environ['PASSWORD_LENGTH']) # Defaults to 6 +##c.HashAuthenticator.secret_key = os.environ['HASH_SECRET_KEY'] # Defaults to '' +##c.HashAuthenticator.password_length = int(os.environ['PASSWORD_LENGTH']) # Defaults to 6 # Can find your password by looking at `hashauthpw --length 10 [username] [key]` # If the `show_logins` option is set to `True`, a CSV file containing #login names and passwords will be served (to admins only) at `/hub/login_list`. -c.HashAuthenticator.show_logins = True # Optional, defaults to False +##c.HashAuthenticator.show_logins = True # Optional, defaults to False # TLS config #c.JupyterHub.port = 8000 diff --git a/makefile b/makefile index 8cc72af..25c6940 100755 --- a/makefile +++ b/makefile @@ -2,6 +2,8 @@ # Distributed under the terms of the Modified BSD License. include .env +## the line below should only be commented out if you want to use `make login` AFTER the jupyterhub has been built. +include secrets/oauth.env .DEFAULT_GOAL=build @@ -47,7 +49,7 @@ userlist: # cert_files= #endif -check-files: userlist secrets/postgres.env +check-files: userlist secrets/postgres.env secrets/oauth.env pull: docker pull $(DOCKER_NOTEBOOK_IMAGE)