diff --git a/docker-compose.portainer.yml b/docker-compose.portainer.yml index b238c4c..00dd6d3 100644 --- a/docker-compose.portainer.yml +++ b/docker-compose.portainer.yml @@ -68,10 +68,10 @@ services: MAIL_FROM: 'mifi Holdings Shorty ' MAIL_PASSWORD: '${SMTP_PASSWORD:?Set SMTP_PASSWORD}' NODE_ENV: production - OIDC_ENABLED: 'true' - OIDC_ISSUER: 'https://git.mifi.dev' - OIDC_CLIENT_ID: '2a6d1ecd-4e2f-42e5-922e-22e878230488' - OIDC_CLIENT_SECRET: '${OIDC_CLIENT_SECRET:?Set OIDC_CLIENT_SECRET}' + # OIDC_ENABLED: 'true' + # OIDC_ISSUER: 'https://git.mifi.dev' + # OIDC_CLIENT_ID: '2a6d1ecd-4e2f-42e5-922e-22e878230488' + # OIDC_CLIENT_SECRET: '${OIDC_CLIENT_SECRET:?Set OIDC_CLIENT_SECRET}' REDIS_ENABLED: 'true' REDIS_HOST: kutt_redis REDIS_PORT: '6379' @@ -85,6 +85,7 @@ services: - 'traefik.http.routers.kutt-mifi.tls.certresolver=letsencrypt' - 'traefik.http.routers.kutt-mifi.service=kutt-short' - 'traefik.http.services.kutt-short.loadbalancer.server.port=3000' + - 'traefik.http.services.kutt-short.loadbalancer.serversTransport=kutt-long-timeout' qr_api: image: ${REGISTRY:-git.mifi.dev}/mifi-holdings/shorty-qr-api:${IMAGE_TAG:-latest} @@ -122,7 +123,7 @@ services: - 'traefik.http.routers.qr-web.tls.certresolver=letsencrypt' - 'traefik.http.routers.qr-web.service=qr-web' - 'traefik.http.routers.qr-web.middlewares=qr-web-basicauth' - - 'traefik.http.middlewares.qr-web-basicauth.basicauth.users=mifi:$$2y$$05$$TS20fkfrmJ3MLc.cgfM6OcuowOstcy/2DTOq0YfirUDU3b0vtNz.' + - 'traefik.http.middlewares.qr-web-basicauth.basicauth.users=mifi:$$apr1$$9fgAWvE1$$bLGgUtpFjdaexkV5gooWq.' - 'traefik.http.services.qr-web.loadbalancer.server.port=3000' networks: diff --git a/qr-web/.dockerignore b/qr-web/.dockerignore index c4270eb..70ab3b2 100644 --- a/qr-web/.dockerignore +++ b/qr-web/.dockerignore @@ -28,3 +28,5 @@ Dockerfile # Generated next-env.d.ts *.tsbuildinfo + +traefik-kutt-timeout.example.yml \ No newline at end of file diff --git a/traefik-kutt-timeout.example.yml b/traefik-kutt-timeout.example.yml new file mode 100644 index 0000000..15e2e79 --- /dev/null +++ b/traefik-kutt-timeout.example.yml @@ -0,0 +1,17 @@ +# Example Traefik dynamic config: longer backend timeout for Kutt. +# +# Use a SEPARATE file (e.g. serverstransports.yaml or kutt-timeout.yaml), NOT inside +# routers.yaml — Traefik can reject serversTransports in a file it treats as routers-only. +# Place this file in the same directory as your other dynamic config (e.g. /etc/traefik/conf.d/) +# so the file provider picks it up. +# +# Then uncomment the serversTransport label on the kutt service in docker-compose.portainer.yml. +# +# responseHeaderTimeout: time to wait for backend response headers (0 = no timeout). +# 300s helps avoid 504 Gateway Timeout when Kutt or OIDC is slow. +# If 504s persist, also raise entrypoint transport.respondingTimeouts.readTimeout in Traefik static config. +http: + serversTransports: + kutt-long-timeout: + forwardingTimeouts: + responseHeaderTimeout: "300s"