-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Magpie: ensure that the
MAGPIE_ADMIN_USERNAME
variable is respected (…
…#418) ## Overview We checked that all username variables are respected in the source code. We checked that there are no instances of the default being hardcoded (the assumption being that no one would ever actually change the variable from the default). The only issue found was that the `MAGPIE_ADMIN_USERNAME` variable was not used to set the default value for `JUPYTERHUB_ADMIN_USERS` properly. ## Changes **Non-breaking changes** - Updates default value for `JUPYTERHUB_ADMIN_USERS` to respect other variable settings **Breaking changes** ## Related Issue / Discussion - Resolves #417 ## Additional Information Links to other issues or sources. <!-- The test suite can be run using a different DACCS config with ``birdhouse_daccs_configs_branch: branch_name`` in the PR description. To globally skip the test suite regardless of the commit message use ``birdhouse_skip_ci: true`` in the PR description. --> birdhouse_daccs_configs_branch: master birdhouse_skip_ci: false
- Loading branch information
Showing
8 changed files
with
28 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,7 +24,6 @@ export MAGPIE_ADMIN_PASSWORD="qwertyqwerty!" | |
export TWITCHER_PROTECTED_PATH="/twitcher/ows/proxy" | ||
export SUPPORT_EMAIL="[email protected]" | ||
export CMIP5_THREDDS_ROOT="birdhouse/CMIP5/CCCMA" | ||
export JUPYTERHUB_ADMIN_USERS="{'admin'}" # python set syntax | ||
export POSTGRES_PAVICS_USERNAME="postgres-pavics" | ||
export POSTGRES_PAVICS_PASSWORD="postgres-qwerty" | ||
export POSTGRES_MAGPIE_USERNAME="postgres-magpie" | ||
|
@@ -426,6 +425,12 @@ export GEOSERVER_ADMIN_PASSWORD="geoserverpass" | |
#c.Spawner.pre_spawn_hook = custom_create_dir_hook | ||
#" | ||
|
||
# Usernames that should be given admin access in jupyterhub | ||
# By default, only the MAGPIE_ADMIN_USERNAME user is given admin access. Update this variable only if you wish | ||
# to give additional users admin access by default. | ||
# Note that you can also give users admin access through the jupyterhub UI. | ||
#export JUPYTERHUB_ADMIN_USERS='{\"${MAGPIE_ADMIN_USERNAME}\", \"othername\"}' # python set syntax | ||
|
||
# Extra PyWPS config for **all** WPS services (currently only Flyingpigeon, Finch and Raven supported). | ||
# export EXTRA_PYWPS_CONFIG=" | ||
# [logging] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters