IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix nginx; fix build oauth containers

Browse Source
This commit is contained in:
Timofey Boyko 2023-10-25 11:41:13 +03:00
parent 8f0ed06219
commit f745a71e43
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/nginx/onlyoffice.conf
View File

@ -273,9 +273,16 @@ server {
location ~* /(clients|scopes) {
proxy_pass http://127.0.0.1:9090;
}
location ~* /oauth2 {
rewrite api/2.0/(.*) /$1 break;
proxy_redirect off;
proxy_pass http://127.0.0.1:8080;
}
}
location /oauth2 {
location ~* /oauth2 {
proxy_redirect off;
proxy_pass http://127.0.0.1:8080;
}

2
install/docker/.env
View File

@ -97,8 +97,6 @@
OAUTH_AUTHORIZATION_CONTAINER_NAME=${CONTAINER_PREFIX}oauth-authorization
OAUTH_API_CONTAINER_NAME=${CONTAINER_PREFIX}oauth-api
DOCSPACE_ADDRESS=${APP_URL_PORTAL}
# service host #
API_SYSTEM_HOST=${CONTAINER_PREFIX}api-system
BACKUP_HOST=${CONTAINER_PREFIX}backup

2
install/docker/oauth2.yml
View File

@ -19,7 +19,6 @@ services:
RABBIT_PORT: ${RABBIT_PORT}
RABBIT_USER_NAME: ${RABBIT_USER_NAME}
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
DOCSPACE_ADDRESS: http://192.168.0.15
onlyoffice-oauth-api:
build:
context: ../../../server/common/ASC.OAuth
@ -38,7 +37,6 @@ services:
RABBIT_PORT: ${RABBIT_PORT}
RABBIT_USER_NAME: ${RABBIT_USER_NAME}
RABBIT_PASSWORD: ${RABBIT_PASSWORD}
DOCSPACE_ADDRESS: http://192.168.0.15/
networks:
default:
name: ${NETWORK_NAME}