Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix error when starting scheduler in k8s mode and fix reverse proxy config template

Browse source
This commit is contained in:
florian 2024-05-12 12:06:11 +02:00
parent c312782e1f
commit 4f3f662d80
No known key found for this signature in database
GPG key ID: 93EE47CC3D061500
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/common/core/reverseproxy/confs/server-http/reverse-proxy.conf
View file

@ -24,21 +24,21 @@ add_header X-Proxy-Cache $upstream_cache_status;
{% set counter = namespace(value=1) %}
{% for k, v in all.items() %}
{% if k.startswith("REVERSE_PROXY_URL") and v != "" +%}
{% set url = v %}
{% set host = all[k.replace("URL", "HOST")] if k.replace("URL", "HOST") in all else "" %}
{% set ws = all[k.replace("URL", "WS")] if k.replace("URL", "WS") in all else "" %}
{% set headers = all[k.replace("URL", "HEADERS")] if k.replace("URL", "HEADERS") in all else "" %}
{% set headers_client = all[k.replace("URL", "HEADERS_CLIENT")] if k.replace("URL", "HEADERS_CLIENT") in all else "" %}
{% set buffering = all[k.replace("URL", "BUFFERING")] if k.replace("URL", "BUFFERING") in all else "yes" %}
{% set keepalive = all[k.replace("URL", "KEEPALIVE")] if k.replace("URL", "KEEPALIVE") in all else "yes" %}
{% set auth_request = all[k.replace("URL", "AUTH_REQUEST")] if k.replace("URL", "AUTH_REQUEST") in all else "" %}
{% set auth_request_signin_url = all[k.replace("URL", "AUTH_REQUEST_SIGNIN_URL")] if k.replace("URL", "AUTH_REQUEST_SIGNIN_URL") in all else "" %}
{% set auth_request_sets = all[k.replace("URL", "AUTH_REQUEST_SET")] if k.replace("URL", "AUTH_REQUEST_SET") in all else "" %}
{% set connect_timeout = all[k.replace("URL", "CONNECT_TIMEOUT")] if k.replace("URL", "CONNECT_TIMEOUT") in all else "60s" %}
{% set read_timeout = all[k.replace("URL", "READ_TIMEOUT")] if k.replace("URL", "READ_TIMEOUT") in all else "60s" %}
{% set send_timeout = all[k.replace("URL", "SEND_TIMEOUT")] if k.replace("URL", "SEND_TIMEOUT") in all else "60s" %}
{% set includes = all[k.replace("URL", "INCLUDES")] if k.replace("URL", "INCLUDES") in all else "" %}
{% if k.startswith("REVERSE_PROXY_HOST") and v != "" +%}
{% set host = v %}
{% set url = all[k.replace("HOST", "URL")] if k.replace("HOST", "URL") in all else "/" %}
{% set ws = all[k.replace("HOST", "WS")] if k.replace("HOST", "WS") in all else "" %}
{% set headers = all[k.replace("HOST", "HEADERS")] if k.replace("HOST", "HEADERS") in all else "" %}
{% set headers_client = all[k.replace("HOST", "HEADERS_CLIENT")] if k.replace("HOST", "HEADERS_CLIENT") in all else "" %}
{% set buffering = all[k.replace("HOST", "BUFFERING")] if k.replace("HOST", "BUFFERING") in all else "yes" %}
{% set keepalive = all[k.replace("HOST", "KEEPALIVE")] if k.replace("HOST", "KEEPALIVE") in all else "yes" %}
{% set auth_request = all[k.replace("HOST", "AUTH_REQUEST")] if k.replace("HOST", "AUTH_REQUEST") in all else "" %}
{% set auth_request_signin_url = all[k.replace("HOST", "AUTH_REQUEST_SIGNIN_URL")] if k.replace("HOST", "AUTH_REQUEST_SIGNIN_URL") in all else "" %}
{% set auth_request_sets = all[k.replace("HOST", "AUTH_REQUEST_SET")] if k.replace("HOST", "AUTH_REQUEST_SET") in all else "" %}
{% set connect_timeout = all[k.replace("HOST", "CONNECT_TIMEOUT")] if k.replace("HOST", "CONNECT_TIMEOUT") in all else "60s" %}
{% set read_timeout = all[k.replace("HOST", "READ_TIMEOUT")] if k.replace("HOST", "READ_TIMEOUT") in all else "60s" %}
{% set send_timeout = all[k.replace("HOST", "SEND_TIMEOUT")] if k.replace("HOST", "SEND_TIMEOUT") in all else "60s" %}
{% set includes = all[k.replace("HOST", "INCLUDES")] if k.replace("HOST", "INCLUDES") in all else "" %}
location {{ url }} {% raw %}{{% endraw +%}
etag off;
set $backend{{ counter.value }} "{{ host }}";

2
src/common/gen/save_config.py
View file

@ -169,7 +169,7 @@ if __name__ == "__main__":
)
db = Database(logger, config_files.get("DATABASE_URI", None))
else:
elif getenv("KUBERNETES_MODE", "no") != "yes":
docker_client = DockerClient(base_url=getenv("DOCKER_HOST", "unix:///var/run/docker.sock"))
while not docker_client.containers.list(filters={"label": "bunkerweb.INSTANCE"}):