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

Rename oauth service to oauth_api_service, add new oauth service

Browse Source
This commit is contained in:
Timofey Boyko 2023-09-28 13:26:00 +03:00
parent ca73c5b0c4
commit f6dca051ac
10 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/build.backend.docker.ps1
View File

@ -13,7 +13,8 @@ $LocalIp = (Get-CimInstance -ClassName Win32_NetworkAdapterConfiguration | Where
$Doceditor = ($LocalIp + ":5013")
$Login = ($LocalIp + ":5011")
$Client = ($LocalIp + ":5001")
$Oauth = ($LocalIp + ":9090")
$Oauth_api = ($LocalIp + ":9090")
$Oauth = ($LocalIp + ":8080")
$PortalUrl = ("http://" + $LocalIp)
$ProxyVersion="v1.0.0"
@ -95,6 +96,7 @@ $Env:Baseimage_Proxy_Run="onlyoffice/4testing-docspace-proxy-runtime:$ProxyVersi
$Env:SERVICE_DOCEDITOR=$Doceditor
$Env:SERVICE_LOGIN=$Login
$Env:SERVICE_CLIENT=$Client
$Env:SERVICE_OAUTH_API=$Oauth_api
$Env:SERVICE_OAUTH=$Oauth
$Env:ROOT_DIR=$RootDir
$Env:BUILD_PATH="/var/www"
@ -109,6 +111,7 @@ Write-Host "LOCAL IP: $LocalIp" -ForegroundColor Blue
Write-Host "SERVICE_DOCEDITOR: $Env:SERVICE_DOCEDITOR" -ForegroundColor Blue
Write-Host "SERVICE_LOGIN: $Env:SERVICE_LOGIN" -ForegroundColor Blue
Write-Host "SERVICE_CLIENT: $Env:SERVICE_CLIENT" -ForegroundColor Blue
Write-Host "SERVICE_OAUTH_API: $Env:SERVICE_OAUTH_API" -ForegroundColor Blue
Write-Host "SERVICE_OAUTH: $Env:SERVICE_OAUTH" -ForegroundColor Blue
Write-Host "INSTALLATION_TYPE: $Env:INSTALLATION_TYPE" -ForegroundColor Blue

5
build/install/docker/.env
View File

@ -125,8 +125,9 @@
SERVICE_DOCEDITOR=${DOCEDITOR_HOST}:5013
SERVICE_LOGIN=${LOGIN_HOST}:5011
SERVICE_HELTHCHECKS=${HELTHCHECKS_HOST}:${SERVICE_PORT}
SERVICE_OAUTH=${OAUTH_HOST}:9090
SERVICE_OAUTH_API=${OAUTH_API_HOST}:9090
SERVICE_OAUTH=${OAUTH_HOST}:8080
NETWORK_NAME=${PRODUCT}
COMPOSE_IGNORE_ORPHANS=True

3
build/install/docker/Dockerfile
View File

@ -176,7 +176,8 @@ RUN chown nginx:nginx /etc/nginx/* -R && \
sed -i 's/127.0.0.1:9834/$service_sso/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:5013/$service_doceditor/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:5011/$service_login/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:9090/$service_oauth/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:9090/$service_oauth_api/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:8080/$service_oauth/' /etc/nginx/conf.d/onlyoffice.conf && \
if [[ -z "${SERVICE_CLIENT}" ]] ; then sed -i 's/127.0.0.1:5001/$service_client/' /etc/nginx/conf.d/onlyoffice.conf; fi && \
sed -i 's/127.0.0.1:5033/$service_healthchecks/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/$public_root/\/var\/www\/public\//' /etc/nginx/conf.d/onlyoffice.conf && \

3
build/install/docker/Dockerfile.app
View File

@ -163,7 +163,8 @@ RUN sed -i 's/127.0.0.1:5010/$service_api_system/' /etc/nginx/conf.d/onlyoffice.
sed -i 's/127.0.0.1:9834/$service_sso/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:5013/$service_doceditor/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:5011/$service_login/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:9090/$service_oauth/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:9090/$service_oauth_api/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:8080/$service_oauth/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:5033/$service_healthchecks/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/$public_root/\/var\/www\/public\//' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/http:\/\/172.*/$document_server;/' /etc/nginx/conf.d/onlyoffice.conf && \

3
build/install/docker/Dockerfile.runtime
View File

@ -120,7 +120,8 @@ RUN chown onlyoffice:onlyoffice /etc/nginx/* -R && \
sed -i 's/127.0.0.1:9834/$service_sso/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:5013/$service_doceditor/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:5011/$service_login/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:9090/$service_oauth/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:9090/$service_oauth_api/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:8080/$service_oauth/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:5001/$service_client/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:5033/$service_healthchecks/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/$public_root/\/var\/www\/public\//' /etc/nginx/conf.d/onlyoffice.conf && \

8
build/install/docker/config/nginx/templates/upstream.conf.template
View File

@ -48,9 +48,15 @@ map $SERVICE_API $service_api {
default $SERVICE_API;
}
map $SERVICE_OAUTH $service_oauth {
map $SERVICE_OAUTH $service_oauth_api {
volatile;
"" 127.0.0.1:9090;
default $SERVICE_OAUTH_API;
}
map $SERVICE_OAUTH $service_oauth {
volatile;
"" 127.0.0.1:8080;
default $SERVICE_OAUTH;
}

1
build/install/docker/docspace.profiles.yml
View File

@ -261,6 +261,7 @@ services:
- SERVICE_NOTIFY=${SERVICE_NOTIFY}
- SERVICE_PEOPLE_SERVER=${SERVICE_PEOPLE_SERVER}
- SERVICE_SOCKET=${SERVICE_SOCKET}
- SERVICE_OAUTH_API=${SERVICE_OAUTH_API}
- SERVICE_OAUTH=${SERVICE_OAUTH}
- SERVICE_STUDIO_NOTIFY=${SERVICE_STUDIO_NOTIFY}
- SERVICE_API=${SERVICE_API}

1
build/install/docker/docspace.yml
View File

@ -207,6 +207,7 @@ services:
- SERVICE_NOTIFY=${SERVICE_NOTIFY}
- SERVICE_PEOPLE_SERVER=${SERVICE_PEOPLE_SERVER}
- SERVICE_SOCKET=${SERVICE_SOCKET}
- SERVICE_OAUTH_API=${SERVICE_OAUTH_API}
- SERVICE_OAUTH=${SERVICE_OAUTH}
- SERVICE_STUDIO_NOTIFY=${SERVICE_STUDIO_NOTIFY}
- SERVICE_API=${SERVICE_API}

4
build/start/start.backend.docker.ps1
View File

@ -13,7 +13,8 @@ $LocalIp = (Get-CimInstance -ClassName Win32_NetworkAdapterConfiguration | Where
$Doceditor = ($LocalIp + ":5013")
$Login = ($LocalIp + ":5011")
$Client = ($LocalIp + ":5001")
$Oauth = ($LocalIp + ":9090")
$Oauth_api = ($LocalIp + ":9090")
$Oauth = ($LocalIp + ":8080")
Set-Location -Path $DockerDir
@ -26,6 +27,7 @@ $Env:DOCUMENT_SERVER_IMAGE_NAME="onlyoffice/documentserver-de:latest"
$Env:SERVICE_DOCEDITOR=$Doceditor
$Env:SERVICE_LOGIN=$Login
$Env:SERVICE_CLIENT=$Client
$Env:SERVICE_OAUTH_API=$Oauth_api
$Env:SERVICE_OAUTH=$Oauth
$Env:ROOT_DIR=$RootDir
$Env:BUILD_PATH="/var/www"

4
config/nginx/onlyoffice.conf
View File

@ -279,6 +279,10 @@ server {
proxy_set_header X-Tenant 1;
}
location /oauth2 {
proxy_pass http://127.0.0.1:8080;
}
location /sso {
rewrite sso/(.*) /$1 break;
proxy_pass http://127.0.0.1:9834;