Compare commits

..

3 Commits

Author SHA1 Message Date
fauno 1638b18b2b feat: configurable timeouts 2026-06-28 19:48:18 -03:00
fauno df2f006894 Merge branch 'master' into large-uploads 2026-06-28 19:36:06 -03:00
p4u1 6d5c012e42 fix: ensure large uploads work 2026-06-03 18:23:29 +02:00
8 changed files with 17 additions and 76 deletions
+7
View File
@@ -15,6 +15,13 @@ LOG_MAX_AGE=1
# This is here so later lines can extend it; you likely don't wanna edit
COMPOSE_FILE="compose.yml"
# Increase read timeout (or change it to 0s) to ensure large file
# uploads work.
#
# https://doc.traefik.io/traefik/reference/install-configuration/entrypoints/#opt-transport-respondingTimeouts-readTimeout
READ_TIMEOUT=60s
WRITE_TIMEOUT=0s
#####################################################################
# General settings #
#####################################################################
+3 -4
View File
@@ -1,4 +1,3 @@
export TRAEFIK_YML_VERSION=v32
export FILE_PROVIDER_YML_VERSION=v13
export ENTRYPOINT_VERSION=v7
export IOCAINE_ENTRYPOINT_VERSION=v1
export TRAEFIK_YML_VERSION=v31a
export FILE_PROVIDER_YML_VERSION=v12
export ENTRYPOINT_VERSION=v5
-25
View File
@@ -1,25 +0,0 @@
---
version: "3.8"
services:
app:
environment:
IOCAINE_ENABLE: "1"
IOCAINE_PLUGIN_VERSION: "v1.2.0"
volumes:
- "plugins-local:/plugins-local"
iocaine:
image: "git.madhouse-project.org/iocaine/iocaine:3.5.0"
environment:
RUST_LOG: "iocaine=info"
ports:
- target: 42069
published: 42069
protocol: tcp
mode: host
networks:
- proxy
volumes:
plugins-local:
+2 -7
View File
@@ -27,9 +27,6 @@ services:
- source: entrypoint
target: /custom-entrypoint.sh
mode: 0555
- source: iocaine_entrypoint
target: /entrypoint.iocaine.sh
mode: 0555
networks:
- proxy
- internal
@@ -37,6 +34,8 @@ services:
- DASHBOARD_ENABLED
- LOG_LEVEL
- ${LOG_MAX_AGE:-0}
- READ_TIMEOUT=${READ_TIMEOUT:-60s}
- WRITE_TIMEOUT=${WRITE_TIMEOUT:-0s}
healthcheck:
test: ["CMD", "traefik", "healthcheck"]
interval: 30s
@@ -118,10 +117,6 @@ configs:
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
file: entrypoint.sh.tmpl
template_driver: golang
iocaine_entrypoint:
name: ${STACK_NAME}_entrypoint_${IOCAINE_ENTRYPOINT_VERSION}
file: entrypoint.iocaine.sh.tmpl
template_driver: golang
volumes:
letsencrypt:
-15
View File
@@ -1,15 +0,0 @@
#!/bin/sh
set -e
apk --no-cache add git go
iocaine_path="/plugins-local/src/git.mstar.dev/mstar/traefik-iocaine-middleware"
if [ ! -d "$iocaine_path" ]; then
git clone --depth 1 --branch $IOCAINE_PLUGIN_VERSION https://git.mstar.dev/mstar/traefik-iocaine-middleware.git $iocaine_path
else
git -C $iocaine_path fetch origin 'refs/tags/*:refs/tags/*'
git -C $iocaine_path checkout tags/$IOCAINE_PLUGIN_VERSION
fi
(cd $iocaine_path && go mod vendor)
exit 0
-4
View File
@@ -15,8 +15,4 @@ export DO_AUTH_TOKEN=$(cat "$DO_AUTH_TOKEN_FILE")
export AZURE_CLIENT_SECRET=$(cat "$AZURE_CLIENT_SECRET_FILE")
{{ end }}
{{ if eq (env "IOCAINE_ENABLE") "1" }}
/entrypoint.iocaine.sh
{{ end }}
/entrypoint.sh "$@"
+1 -10
View File
@@ -17,15 +17,6 @@ http:
authResponseHeaders:
- X-Forwarded-User
{{ end }}
{{ if eq (env "IOCAINE_ENABLE") "1" }}
iocaine:
plugin:
iocaine:
iocaineHttpUrl: "http://iocaine:42069"
methods:
- GET
- HEAD
{{ end }}
{{ if eq (env "BASIC_AUTH") "1" }}
basicauth:
basicAuth:
@@ -70,4 +61,4 @@ tls:
certificates:
- certFile: /run/secrets/ssl_cert
keyFile: /run/secrets/ssl_key
{{ end }}
{{ end }}
+4 -11
View File
@@ -33,6 +33,10 @@ entrypoints:
to: web-secure
web-secure:
address: ":443"
transport:
respondingTimeouts:
readTimeout: {{ env "READ_TIMEOUT" }}
writeTimeout: {{ env "WRITE_TIMEOUT" }}
http:
encodedCharacters:
allowEncodedSlash: true
@@ -42,10 +46,6 @@ entrypoints:
allowEncodedPercent: true
allowEncodedQuestionMark: true
allowEncodedHash: true
{{- if eq (env "IOCAINE_ENABLE") "1" }}
middlewares:
- iocaine@file
{{- end }}
{{- if eq (env "GITEA_SSH_ENABLED") "1" }}
gitea-ssh:
address: ":2222"
@@ -157,10 +157,3 @@ certificatesResolvers:
- "1.1.1.1:53"
- "9.9.9.9:53"
{{- end }}
{{ if eq (env "IOCAINE_ENABLE") "1" }}
experimental:
localPlugins:
iocaine:
moduleName: git.mstar.dev/mstar/traefik-iocaine-middleware
{{ end }}