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

docker: fixed forward params

Browse Source
This commit is contained in:
Alexey Bannov 2023-05-04 15:17:34 +03:00
parent e1c8226587
commit 1836a8d8c7
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/install/docker/.env
View File

@ -34,6 +34,8 @@
# app service environment # # app service environment #
ENV_EXTENSION=none ENV_EXTENSION=none
APP_CORE_BASE_DOMAIN=localhost APP_CORE_BASE_DOMAIN=localhost
APP_KNOWN_PROXIES=""
APP_KNOWN_NETWORKS=""
APP_CORE_MACHINEKEY=your_core_machinekey APP_CORE_MACHINEKEY=your_core_machinekey
DOCUMENT_SERVER_JWT_SECRET=your_jwt_secret DOCUMENT_SERVER_JWT_SECRET=your_jwt_secret

16
build/install/docker/docker-entrypoint.py
View File

@ -152,17 +152,17 @@ ip_address = netifaces.ifaddresses('eth0').get(netifaces.AF_INET)[0].get('addr')
netmask = netifaces.ifaddresses('eth0').get(netifaces.AF_INET)[0].get('netmask') netmask = netifaces.ifaddresses('eth0').get(netifaces.AF_INET)[0].get('netmask')
ip_address_netmask = '%s/%s' % (ip_address, netmask) ip_address_netmask = '%s/%s' % (ip_address, netmask)
interface_cidr = IPNetwork(ip_address_netmask) interface_cidr = IPNetwork(ip_address_netmask)
knownNetwork = str(interface_cidr) knownNetwork = [str(interface_cidr)]
knownProxies = "127.0.0.1" knownProxies = ["127.0.0.1"]
if not APP_KNOWN_NETWORKS: if APP_KNOWN_NETWORKS:
knownNetwork = knownNetwork + "," + APP_KNOWN_NETWORKS knownNetwork= knownNetwork + [x.strip() for x in APP_KNOWN_NETWORKS.split(',')]
if not APP_KNOWN_PROXIES: if APP_KNOWN_PROXIES:
knownProxies = knownProxies + "," + APP_KNOWN_PROXIES knownNetwork= knownNetwork + [x.strip() for x in APP_KNOWN_PROXIES.split(',')]
updateJsonData(jsonData,"$.core.hosting.forwardedHeadersOptions.knownNetworks", [knownNetwork]) updateJsonData(jsonData,"$.core.hosting.forwardedHeadersOptions.knownNetworks", knownNetwork)
updateJsonData(jsonData,"$.core.hosting.forwardedHeadersOptions.knownProxies", [knownProxies]) updateJsonData(jsonData,"$.core.hosting.forwardedHeadersOptions.knownProxies", knownProxies)
writeJsonFile(filePath, jsonData) writeJsonFile(filePath, jsonData)