From a3c9c0ffd3f669a017c54a0a1879a3f9706b2dec Mon Sep 17 00:00:00 2001 From: Maksim Pankov Date: Tue, 19 Nov 2024 19:44:31 +0000 Subject: [PATCH] fixed auth for blog --- services/auth/.gitignore | 1 + services/auth/docker-compose.yml | 3 ++- services/ingress/blog.conf | 4 ++-- services/oauth-proxy/docker-compose.yml | 8 +++++--- services/transmission/data/config/settings.json | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 services/auth/.gitignore diff --git a/services/auth/.gitignore b/services/auth/.gitignore new file mode 100644 index 0000000..1269488 --- /dev/null +++ b/services/auth/.gitignore @@ -0,0 +1 @@ +data diff --git a/services/auth/docker-compose.yml b/services/auth/docker-compose.yml index 352de33..d37bbdd 100644 --- a/services/auth/docker-compose.yml +++ b/services/auth/docker-compose.yml @@ -6,5 +6,6 @@ services: environment: - driverName=postgres - dataSourceName=user=casdoor password=73F(+b3zW_D-4LM3fTgh host=192.168.0.101 port=5432 dbname=casdoor - + volumes: + - ./data/:/files/ diff --git a/services/ingress/blog.conf b/services/ingress/blog.conf index eb3056f..8bd2d41 100644 --- a/services/ingress/blog.conf +++ b/services/ingress/blog.conf @@ -24,7 +24,7 @@ server { } server { - listen localhost:7788; + listen 192.168.0.101:7788; location / { root /opt/blog_content/; try_files $uri $uri/ $uri.html =404; @@ -40,4 +40,4 @@ server { server_name blog.maksim-pankov.ru; listen 80; return 404; # managed by Certbot -} \ No newline at end of file +} diff --git a/services/oauth-proxy/docker-compose.yml b/services/oauth-proxy/docker-compose.yml index f12ed36..45e362c 100644 --- a/services/oauth-proxy/docker-compose.yml +++ b/services/oauth-proxy/docker-compose.yml @@ -7,9 +7,9 @@ services: - OAUTH2_PROXY_REDIRECT_URL=https://blog.maksim-pankov.ru/oauth2/callback - OAUTH2_PROXY_REVERSE_PROXY=true - OAUTH2_PROXY_SKIP_PROVIDER_BUTTON=true - - OAUTH2_PROXY_UPSTREAMS=http://localhost:7788/ + - OAUTH2_PROXY_UPSTREAMS=http://192.168.0.101:7788/ # - OAUTH2_PROXY_UPSTREAMS=file:///opt/blog_content/#/ - - OAUTH2_PROXY_UPSTREAMS=static://200 + # - OAUTH2_PROXY_UPSTREAMS=static://200 - OAUTH2_PROXY_CLIENT_ID=jigran_blog - OAUTH2_PROXY_CLIENT_SECRET=c72ba7c0d489e020e0b5875729186ac4fb6872d7 - OAUTH2_PROXY_OIDC_ISSUER_URL=https://auth.maksim-pankov.ru @@ -17,4 +17,6 @@ services: - OAUTH2_PROXY_EMAIL_DOMAINS=* - OAUTH2_PROXY_WHITELIST_DOMAINS=*.maksim-pankov.ru ports: - - 9988:9988 \ No newline at end of file + - 9988:9988 + extra_hosts: + - "host.docker.internal:host-gateway" diff --git a/services/transmission/data/config/settings.json b/services/transmission/data/config/settings.json index f3b66d0..6a8f550 100644 --- a/services/transmission/data/config/settings.json +++ b/services/transmission/data/config/settings.json @@ -50,7 +50,7 @@ "rpc-enabled": true, "rpc-host-whitelist": "", "rpc-host-whitelist-enabled": false, - "rpc-password": "{9e928f24e0b8a01bebecd0e3ca3855cd5634a062JF/eKeW0", + "rpc-password": "{def05d3bb06111dff02ca306d9f92e5da4bc5e62EfULPoIa", "rpc-port": 9091, "rpc-socket-mode": "0750", "rpc-url": "/transmission/",