From f6dca051acb328b7316faf0263f97a25a5c932b3 Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Thu, 28 Sep 2023 13:26:00 +0300 Subject: [PATCH] Rename oauth service to oauth_api_service, add new oauth service --- build/build.backend.docker.ps1 | 5 ++++- build/install/docker/.env | 5 +++-- build/install/docker/Dockerfile | 3 ++- build/install/docker/Dockerfile.app | 3 ++- build/install/docker/Dockerfile.runtime | 3 ++- .../docker/config/nginx/templates/upstream.conf.template | 8 +++++++- build/install/docker/docspace.profiles.yml | 1 + build/install/docker/docspace.yml | 1 + build/start/start.backend.docker.ps1 | 4 +++- config/nginx/onlyoffice.conf | 4 ++++ 10 files changed, 29 insertions(+), 8 deletions(-) diff --git a/build/build.backend.docker.ps1 b/build/build.backend.docker.ps1 index a1940c895f..a634369066 100644 --- a/build/build.backend.docker.ps1 +++ b/build/build.backend.docker.ps1 @@ -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 diff --git a/build/install/docker/.env b/build/install/docker/.env index ae626f42ed..cfa9f2f7f2 100644 --- a/build/install/docker/.env +++ b/build/install/docker/.env @@ -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 diff --git a/build/install/docker/Dockerfile b/build/install/docker/Dockerfile index b6d466d29e..cc11082231 100644 --- a/build/install/docker/Dockerfile +++ b/build/install/docker/Dockerfile @@ -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 && \ diff --git a/build/install/docker/Dockerfile.app b/build/install/docker/Dockerfile.app index f207117f21..83b46b6860 100644 --- a/build/install/docker/Dockerfile.app +++ b/build/install/docker/Dockerfile.app @@ -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 && \ diff --git a/build/install/docker/Dockerfile.runtime b/build/install/docker/Dockerfile.runtime index b6bbfa4110..e731cafd8d 100644 --- a/build/install/docker/Dockerfile.runtime +++ b/build/install/docker/Dockerfile.runtime @@ -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 && \ diff --git a/build/install/docker/config/nginx/templates/upstream.conf.template b/build/install/docker/config/nginx/templates/upstream.conf.template index 49a6825c7a..9f52f56afc 100644 --- a/build/install/docker/config/nginx/templates/upstream.conf.template +++ b/build/install/docker/config/nginx/templates/upstream.conf.template @@ -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; } diff --git a/build/install/docker/docspace.profiles.yml b/build/install/docker/docspace.profiles.yml index f16c2bcfc2..5bf91b64e8 100644 --- a/build/install/docker/docspace.profiles.yml +++ b/build/install/docker/docspace.profiles.yml @@ -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} diff --git a/build/install/docker/docspace.yml b/build/install/docker/docspace.yml index 8decb941fa..0fd3353fed 100644 --- a/build/install/docker/docspace.yml +++ b/build/install/docker/docspace.yml @@ -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} diff --git a/build/start/start.backend.docker.ps1 b/build/start/start.backend.docker.ps1 index 74f37213c8..8db9bb78b6 100644 --- a/build/start/start.backend.docker.ps1 +++ b/build/start/start.backend.docker.ps1 @@ -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" diff --git a/config/nginx/onlyoffice.conf b/config/nginx/onlyoffice.conf index 2c063acc8c..682733dc57 100644 --- a/config/nginx/onlyoffice.conf +++ b/config/nginx/onlyoffice.conf @@ -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;