From 11fd6d6d4dbccfb8695c572d1d815c18c9aaf33d Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Wed, 3 Feb 2021 17:11:32 +0100 Subject: [PATCH] clean up --- docker-compose.accounts.yml | 52 +++++++++++------------ docker/kratos/oathkeeper/access-rules.yml | 34 +++++++++++++++ 2 files changed, 60 insertions(+), 26 deletions(-) diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml index d271a100..a84c64ed 100644 --- a/docker-compose.accounts.yml +++ b/docker-compose.accounts.yml @@ -101,32 +101,32 @@ services: depends_on: - kratos-migrate - kratos-selfservice-ui-node: - image: oryd/kratos-selfservice-ui-node:v0.5.0-alpha.1 - container_name: kratos-selfservice-ui-node - restart: on-failure - logging: *default-logging - volumes: - - ./docker/kratos-selfservice-ui-node/main.hbs:/usr/src/app/views/layouts/main.hbs:ro - - ./docker/kratos-selfservice-ui-node/login.hbs:/usr/src/app/views/login.hbs:ro - - ./docker/kratos-selfservice-ui-node/dashboard.hbs:/usr/src/app/views/dashboard.hbs:ro - - ./docker/kratos-selfservice-ui-node/registration.hbs:/usr/src/app/views/registration.hbs:ro - - ./docker/kratos-selfservice-ui-node/icon_logo.hbs:/usr/src/app/views/partials/icon_logo.hbs:ro - - ./docker/kratos-selfservice-ui-node/branding.css:/usr/src/app/public/branding.css:ro - - ./docker/kratos-selfservice-ui-node/favico.png:/usr/src/app/public/favico.png:ro - environment: - - PORT=4435 - - SECURITY_MODE=jwks - - PROJECT_NAME=Skynet - - BASE_URL=/ - - KRATOS_BROWSER_URL=/.ory/kratos/public - - JWKS_URL=http://oathkeeper:4456/.well-known/jwks.json - - KRATOS_PUBLIC_URL=http://kratos:4433/ - - KRATOS_ADMIN_URL=http://kratos:4434/ - - SQA_OPT_OUT=true - networks: - shared: - ipv4_address: 10.10.10.82 + # kratos-selfservice-ui-node: + # image: oryd/kratos-selfservice-ui-node:v0.5.0-alpha.1 + # container_name: kratos-selfservice-ui-node + # restart: on-failure + # logging: *default-logging + # volumes: + # - ./docker/kratos-selfservice-ui-node/main.hbs:/usr/src/app/views/layouts/main.hbs:ro + # - ./docker/kratos-selfservice-ui-node/login.hbs:/usr/src/app/views/login.hbs:ro + # - ./docker/kratos-selfservice-ui-node/dashboard.hbs:/usr/src/app/views/dashboard.hbs:ro + # - ./docker/kratos-selfservice-ui-node/registration.hbs:/usr/src/app/views/registration.hbs:ro + # - ./docker/kratos-selfservice-ui-node/icon_logo.hbs:/usr/src/app/views/partials/icon_logo.hbs:ro + # - ./docker/kratos-selfservice-ui-node/branding.css:/usr/src/app/public/branding.css:ro + # - ./docker/kratos-selfservice-ui-node/favico.png:/usr/src/app/public/favico.png:ro + # environment: + # - PORT=4435 + # - SECURITY_MODE=jwks + # - PROJECT_NAME=Skynet + # - BASE_URL=/ + # - KRATOS_BROWSER_URL=/.ory/kratos/public + # - JWKS_URL=http://oathkeeper:4456/.well-known/jwks.json + # - KRATOS_PUBLIC_URL=http://kratos:4433/ + # - KRATOS_ADMIN_URL=http://kratos:4434/ + # - SQA_OPT_OUT=true + # networks: + # shared: + # ipv4_address: 10.10.10.82 dashboard: build: diff --git a/docker/kratos/oathkeeper/access-rules.yml b/docker/kratos/oathkeeper/access-rules.yml index e6f4b296..ccc31a58 100644 --- a/docker/kratos/oathkeeper/access-rules.yml +++ b/docker/kratos/oathkeeper/access-rules.yml @@ -18,6 +18,40 @@ mutators: - handler: noop +# - id: "ory:kratos-selfservice-ui-node:anonymous" +# upstream: +# preserve_host: true +# url: "http://kratos-selfservice-ui-node:4435" +# match: +# url: "http://oathkeeper:4455/<{error,recovery,verify,auth/*,**.css,**.js}{/,}>" +# methods: +# - GET +# authenticators: +# - handler: anonymous +# authorizer: +# handler: allow +# mutators: +# - handler: noop + +# - id: "ory:kratos-selfservice-ui-node:protected" +# upstream: +# preserve_host: true +# url: "http://kratos-selfservice-ui-node:4435" +# match: +# url: "http://oathkeeper:4455/<{,debug,dashboard,settings}>" +# methods: +# - GET +# authenticators: +# - handler: cookie_session +# authorizer: +# handler: allow +# mutators: +# - handler: id_token +# errors: +# - handler: redirect +# config: +# to: http://127.0.0.1/auth/login + - id: "dashboard:anonymous" upstream: preserve_host: true