diff --git a/chart/values.prod.yaml b/chart/values.prod.yaml index 42e029e..e6c6e05 100644 --- a/chart/values.prod.yaml +++ b/chart/values.prod.yaml @@ -1,13 +1,13 @@ ingress: - hostname: cleandb.platform.moleculemaker.org + hostname: cleandb.openenzymedb.platform.moleculemaker.org extraHosts: - - cleandb.frontend.mmli1.ncsa.illinois.edu + - cleandb.frontend.openenzymedb.mmli1.ncsa.illinois.edu tls: true annotations: cert-manager.io/cluster-issuer: letsencrypt-production kubernetes.io/tls-acme: "true" traefik.ingress.kubernetes.io/router.tls: "true" - traefik.ingress.kubernetes.io/router.middlewares: "alphasynthesis-cleandb-prod-domain-redirect@kubernetescrd" + traefik.ingress.kubernetes.io/router.middlewares: "openenzymedb-oed-cors-header@kubernetescrd,openenzymedb-oed-redirect-to-login@kubernetescrd,openenzymedb-oed-private-auth@kubernetescrd,alphasynthesis-cleandb-prod-domain-redirect@kubernetescrd" controller: image: moleculemaker/cleandb-frontend:main @@ -15,8 +15,8 @@ controller: config: hostname: "https://mmli.fastapi.mmli1.ncsa.illinois.edu" basePath: "" - signInUrl: "https://auth.platform.moleculemaker.org/oauth2/start?rd=https%3A%2F%2Fcleandb.platform.moleculemaker.org%2Fconfiguration" - signOutUrl: "https://auth.platform.moleculemaker.org/oauth2/sign_out?rd=https%3A%2F%2Fcleandb.platform.moleculemaker.org%2Fconfiguration" + signInUrl: "https://auth.platform.moleculemaker.org/oauth2/start?rd=https%3A%2F%2Fcleandb.openenzymedb.platform.moleculemaker.org%2Fconfiguration" + signOutUrl: "https://auth.platform.moleculemaker.org/oauth2/sign_out?rd=https%3A%2F%2Fcleandb.openenzymedb.platform.moleculemaker.org%2Fconfiguration" userInfoUrl: "https://auth.platform.moleculemaker.org/oauth2/userinfo" frontendOnly: "false" @@ -28,6 +28,6 @@ extraDeploy: namespace: alphasynthesis spec: redirectRegex: - regex: "^https://cleandb.frontend.mmli1.ncsa.illinois.edu/(.*)" - replacement: "https://cleandb.platform.moleculemaker.org/${1}" + regex: "^https://cleandb.frontend.openenzymedb.mmli1.ncsa.illinois.edu/(.*)" + replacement: "https://cleandb.openenzymedb.platform.moleculemaker.org/${1}" permanent: true diff --git a/chart/values.staging.yaml b/chart/values.staging.yaml index 0398eeb..10fe117 100644 --- a/chart/values.staging.yaml +++ b/chart/values.staging.yaml @@ -1,18 +1,19 @@ ingress: - hostname: cleandb.frontend.staging.mmli1.ncsa.illinois.edu + hostname: cleandb.frontend.staging.openenzymedb.mmli1.ncsa.illinois.edu tls: true annotations: cert-manager.io/cluster-issuer: letsencrypt-production kubernetes.io/tls-acme: "true" traefik.ingress.kubernetes.io/router.tls: "true" + traefik.ingress.kubernetes.io/router.middlewares: "openenzymedb-oed-staging-redirect-to-login@kubernetescrd,openenzymedb-oed-staging-private-auth@kubernetescrd" controller: image: moleculemaker/cleandb-frontend:staging config: - hostname: "https://mmli.fastapi.staging.mmli1.ncsa.illinois.edu" + hostname: "https://mmli.fastapi.staging.openenzymedb.mmli1.ncsa.illinois.edu" basePath: "" - signInUrl: "https://mmli1.ncsa.illinois.edu/oauth2/start?rd=https%3A%2F%2Fcleandb.frontend.staging.mmli1.ncsa.illinois.edu%2Fconfiguration" - signOutUrl: "https://mmli1.ncsa.illinois.edu/oauth2/sign_out?rd=https%3A%2F%2Fcleandb.frontend.staging.mmli1.ncsa.illinois.edu%2Fconfiguration" + signInUrl: "https://mmli1.ncsa.illinois.edu/oauth2/start?rd=https%3A%2F%2Fcleandb.frontend.staging.openenzymedb.mmli1.ncsa.illinois.edu%2Fconfiguration" + signOutUrl: "https://mmli1.ncsa.illinois.edu/oauth2/sign_out?rd=https%3A%2F%2Fcleandb.frontend.staging.openenzymedb.mmli1.ncsa.illinois.edu%2Fconfiguration" userInfoUrl: "https://mmli1.ncsa.illinois.edu/oauth2/userinfo" frontendOnly: "false"