Skip to content

Commit 4dbc194

Browse files
author
maxim-lixakov
committed
[DOP-19933] - update worker, scheduler, keycloak documentation
1 parent f8103ae commit 4dbc194

22 files changed

+333
-64
lines changed

.env.docker

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@ ENV=LOCAL
55
SYNCMASTER__SERVER__DEBUG=true
66
SYNCMASTER__SERVER__LOG_URL_TEMPLATE=https://grafana.example.com?correlation_id={{ correlation_id }}&run_id={{ run.id }}
77

8+
# Session
9+
SYNCMASTER__SERVER__SESSION__SECRET_KEY=session_secret_key
10+
11+
# Postgres
12+
SYNCMASTER__DATABASE__URL=postgresql+asyncpg://syncmaster:changeme@db:5432/syncmaster
13+
14+
# RabbitMQ
15+
SYNCMASTER__BROKER__URL=amqp://guest:guest@rabbitmq:5672/
16+
817
# Logging
918
SYNCMASTER__LOGGING__SETUP=True
1019
SYNCMASTER__LOGGING__PRESET=colored
@@ -15,13 +24,6 @@ SYNCMASTER__ENCRYPTION__CRYPTO_KEY=UBgPTioFrtH2unlC4XFDiGf5sYfzbdSf_VgiUSaQc94=
1524
# Scheduler settings
1625
SYNCMASTER__SCHEDULER__TRANSFER_FETCHING_TIMEOUT_SECONDS=200
1726

18-
# Session
19-
SYNCMASTER__SERVER__SESSION__SECRET_KEY=session_secret_key
20-
21-
# Postgres
22-
SYNCMASTER__DATABASE__URL=postgresql+asyncpg://syncmaster:changeme@db:5432/syncmaster
23-
24-
# TODO: add to KeycloakAuthProvider documentation about creating new realms, add users, etc.
2527
# KEYCLOAK Auth
2628
SYNCMASTER__AUTH__KEYCLOAK__SERVER_URL=http://keycloak:8080
2729
SYNCMASTER__AUTH__KEYCLOAK__REALM_NAME=manually_created
@@ -36,9 +38,6 @@ SYNCMASTER__AUTH__PROVIDER=syncmaster.backend.providers.auth.keycloak_provider.K
3638
SYNCMASTER__AUTH__PROVIDER=syncmaster.backend.providers.auth.dummy_provider.DummyAuthProvider
3739
SYNCMASTER__AUTH__ACCESS_TOKEN__SECRET_KEY=secret
3840

39-
# RabbitMQ
40-
SYNCMASTER__BROKER__URL=amqp://guest:guest@rabbitmq:5672/
41-
4241
# S3
4342
MINIO_ACCESS_KEY=syncmaster
4443
MINIO_SECRET_KEY=changeme

.env.local

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,24 @@ export ENV=LOCAL
55
export SYNCMASTER__SERVER__DEBUG=true
66
export SYNCMASTER__SERVER__LOG_URL_TEMPLATE="https://grafana.example.com?correlation_id={{ correlation_id }}&run_id={{ run.id }}"
77

8+
# Session
9+
export SYNCMASTER__SERVER__SESSION__SECRET_KEY=session_secret_key
10+
11+
# Postgres
12+
export SYNCMASTER__DATABASE__URL=postgresql+asyncpg://syncmaster:changeme@localhost:5432/syncmaster
13+
14+
# RabbitMQ
15+
export SYNCMASTER__BROKER__URL=amqp://guest:guest@localhost:5672/
16+
817
# Logging
918
export SYNCMASTER__LOGGING__SETUP=True
1019
export SYNCMASTER__LOGGING__PRESET=colored
1120

12-
# Scheduler settings
13-
export SYNCMASTER__SCHEDULER__TRANSFER_FETCHING_TIMEOUT_SECONDS=200
14-
15-
# Session
16-
export SYNCMASTER__SERVER__SESSION__SECRET_KEY=session_secret_key
17-
1821
# Encrypt / Decrypt credentials data
1922
export SYNCMASTER__ENCRYPTION__CRYPTO_KEY=UBgPTioFrtH2unlC4XFDiGf5sYfzbdSf_VgiUSaQc94=
2023

21-
# Postgres
22-
export SYNCMASTER__DATABASE__URL=postgresql+asyncpg://syncmaster:changeme@localhost:5432/syncmaster
24+
# Scheduler settings
25+
export SYNCMASTER__SCHEDULER__TRANSFER_FETCHING_TIMEOUT_SECONDS=200
2326

2427
# Keycloack Auth
2528
export SYNCMASTER__AUTH__KEYCLOAK__SERVER_URL=http://keycloak:8080
@@ -35,9 +38,6 @@ export SYNCMASTER__AUTH__PROVIDER=syncmaster.backend.providers.auth.keycloak_pro
3538
export SYNCMASTER__AUTH__PROVIDER=syncmaster.backend.providers.auth.dummy_provider.DummyAuthProvider
3639
export SYNCMASTER__AUTH__ACCESS_TOKEN__SECRET_KEY=secret
3740

38-
# RabbitMQ
39-
export SYNCMASTER__BROKER__URL=amqp://guest:guest@localhost:5672/
40-
4141
export TEST_S3_HOST_FOR_CONFTEST=localhost
4242
export TEST_S3_PORT_FOR_CONFTEST=9010
4343
export TEST_S3_HOST_FOR_WORKER=test-s3

docs/_static/architecture.png

-30.3 KB
Loading

docs/backend/auth/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Syncmaster supports different auth provider implementations. You can change impl
1212
:caption: Auth providers
1313

1414
dummy
15-
keycloak
15+
keycloak/index
1616

1717
.. toctree::
1818
:maxdepth: 2
127 KB
Loading
130 KB
Loading
336 KB
Loading
119 KB
Loading
383 KB
Loading
116 KB
Loading

0 commit comments

Comments
 (0)