From ef6702b3f314669a0f915ccea32f7494c8480007 Mon Sep 17 00:00:00 2001 From: John Joyce Date: Fri, 2 Jul 2021 10:00:12 -0700 Subject: [PATCH 1/2] Fixing OIDC configuration docs --- docker/datahub-frontend/env/docker.env | 2 +- docs/how/auth/sso/configure-oidc-react-google.md | 2 +- docs/how/auth/sso/configure-oidc-react-okta.md | 2 +- docs/how/auth/sso/configure-oidc-react.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/datahub-frontend/env/docker.env b/docker/datahub-frontend/env/docker.env index 9ede27d03f9ce3..b57e6700f36cad 100644 --- a/docker/datahub-frontend/env/docker.env +++ b/docker/datahub-frontend/env/docker.env @@ -27,7 +27,7 @@ JAVA_OPTS=-Xms256m -Xmx256m -Dhttp.port=9002 -Dconfig.file=datahub-frontend/conf # AUTH_JAAS_ENABLED=false # Uncomment to disable persistence of client-side analytics events -# DATAHUB_ANALYTICS_ENABLED=false +DATAHUB_ANALYTICS_ENABLED=false # Required Kafka Producer Configs KAFKA_BOOTSTRAP_SERVER=broker:29092 diff --git a/docs/how/auth/sso/configure-oidc-react-google.md b/docs/how/auth/sso/configure-oidc-react-google.md index c3aa82f5a967a4..644bab32ddeaa8 100644 --- a/docs/how/auth/sso/configure-oidc-react-google.md +++ b/docs/how/auth/sso/configure-oidc-react-google.md @@ -91,7 +91,7 @@ Replacing the placeholders above with the client id & client secret received fro Now, simply restart the `datahub-frontend-react` container to enable the integration. ``` -docker-compose -p datahub -f docker-compose.yml -f docker-compose.override.yml -f docker-compose.react.yml restart datahub-frontend-react +docker-compose -p datahub -f docker-compose.yml -f docker-compose.override.yml up datahub-frontend-react ``` Navigate to your DataHub domain to see SSO in action. diff --git a/docs/how/auth/sso/configure-oidc-react-okta.md b/docs/how/auth/sso/configure-oidc-react-okta.md index 796a36e2ba7b2b..f5381b26409c34 100644 --- a/docs/how/auth/sso/configure-oidc-react-okta.md +++ b/docs/how/auth/sso/configure-oidc-react-okta.md @@ -74,7 +74,7 @@ Replacing the placeholders above with the client id & client secret received fro Now, simply restart the `datahub-frontend-react` container to enable the integration. ``` -docker-compose -p datahub -f docker-compose.yml -f docker-compose.override.yml -f docker-compose.react.yml restart datahub-frontend-react +docker-compose -p datahub -f docker-compose.yml -f docker-compose.override.yml up datahub-frontend-react ``` Navigate to your DataHub domain to see SSO in action. diff --git a/docs/how/auth/sso/configure-oidc-react.md b/docs/how/auth/sso/configure-oidc-react.md index 1495086c75a8d6..d78aa32da798ef 100644 --- a/docs/how/auth/sso/configure-oidc-react.md +++ b/docs/how/auth/sso/configure-oidc-react.md @@ -130,7 +130,7 @@ as form parameters in the HTTP POST request. For more info, see [OAuth 2.0 Clien Once configuration has been updated, `datahub-frontend-react` will need to be restarted to pick up the new environment variables: ``` -docker-compose -p datahub -f docker-compose.yml -f docker-compose.override.yml -f docker-compose.react.yml restart datahub-frontend-react +docker-compose -p datahub -f docker-compose.yml -f docker-compose.override.yml up datahub-frontend-react ``` >Note that by default, enabling OIDC will *not* disable the dummy JAAS authentication path, which can be reached at the `/login` From 69cc7358f12ee466019ca97afe59147137106f1b Mon Sep 17 00:00:00 2001 From: John Joyce Date: Fri, 2 Jul 2021 10:04:02 -0700 Subject: [PATCH 2/2] Revert analytics enabled --- docker/datahub-frontend/env/docker.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/datahub-frontend/env/docker.env b/docker/datahub-frontend/env/docker.env index b57e6700f36cad..9ede27d03f9ce3 100644 --- a/docker/datahub-frontend/env/docker.env +++ b/docker/datahub-frontend/env/docker.env @@ -27,7 +27,7 @@ JAVA_OPTS=-Xms256m -Xmx256m -Dhttp.port=9002 -Dconfig.file=datahub-frontend/conf # AUTH_JAAS_ENABLED=false # Uncomment to disable persistence of client-side analytics events -DATAHUB_ANALYTICS_ENABLED=false +# DATAHUB_ANALYTICS_ENABLED=false # Required Kafka Producer Configs KAFKA_BOOTSTRAP_SERVER=broker:29092