diff --git a/back b/back index 61f3a53..1dc7c4f 160000 --- a/back +++ b/back @@ -1 +1 @@ -Subproject commit 61f3a532ebbb72ba11280d3aca914aa321e661a9 +Subproject commit 1dc7c4fd87f0c70da4dfd4f39e42a9a5ceb79e69 diff --git a/config/hydra/hydra.yml b/config/hydra/hydra.yml index 954027a..382863b 100644 --- a/config/hydra/hydra.yml +++ b/config/hydra/hydra.yml @@ -4,11 +4,16 @@ serve: urls: self: - issuer: http://127.0.0.1:4444 + issuer: http://oauth2.logidex.ru + public: http://oauth2.logidex.ru + admin: http://oauth2.logidex.ru consent: http://id.logidex.ru/consent - login: http://id.logidex.ru/login + login: http://id.logidex.ru/ logout: http://id.logidex.ru/logout +strategies: + access_token: jwt + secrets: system: - youReallyNeedToChangeThis diff --git a/config/nginx/nginx.conf b/config/nginx/nginx.conf index 441e2a9..ab00ab4 100644 --- a/config/nginx/nginx.conf +++ b/config/nginx/nginx.conf @@ -22,6 +22,9 @@ server { if ($arg_secret = "CHANGE-ME-INSECURE-PASSWORD") { set $allow 1; } + if ($http_x_secret = "CHANGE-ME-INSECURE-PASSWORD") { + set $allow 1; + } if ($allow = 0) { return 403; } diff --git a/docker-compose.yml b/docker-compose.yml index ea61563..cbae056 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,6 @@ services: command: serve -c /etc/config/hydra/hydra.yml all --dev depends_on: - hydra-migrate - - postgres volumes: - type: bind source: ./config/hydra @@ -12,7 +11,7 @@ services: networks: - appnet environment: - - DSN=postgres://hydra:secret@postgres:5432/hydra?sslmode=disable&max_conns=20&max_idle_conns=4 + - DSN=postgres://postgres:GjitkeYf%5Beq@172.17.0.1:5432/hydra?sslmode=disable&max_conns=20&max_idle_conns=4 hydra-migrate: image: oryd/hydra:v2.3.0 command: migrate -c /etc/config/hydra/hydra.yml sql up -e --yes @@ -23,9 +22,7 @@ services: networks: - appnet environment: - - DSN=postgres://hydra:secret@postgres:5432/hydra?sslmode=disable&max_conns=20&max_idle_conns=4 - depends_on: - - postgres + - DSN=postgres://postgres:GjitkeYf%5Beq@172.17.0.1:5432/hydra?sslmode=disable&max_conns=20&max_idle_conns=4 nginx: image: nginx:latest volumes: @@ -41,14 +38,6 @@ services: - front networks: - appnet - postgres: - image: postgres:17 - environment: - - POSTGRES_USER=hydra - - POSTGRES_PASSWORD=secret - - POSTGRES_DB=hydra - networks: - - appnet front: image: git.logidex.ru/aserbin/logidex-id-frontend:latest environment: