Compare commits
15 Commits
Author | SHA1 | Date | |
---|---|---|---|
dd5c5c2663 | |||
830559895e | |||
ac53e9debe
|
|||
acb4c6960a
|
|||
22578d1e8e | |||
55ad530fb7 | |||
54fe45da2f | |||
e21dbc655a | |||
b9d825b5c5 | |||
74b3ee6716 | |||
14d5d79520 | |||
7185e6ab43 | |||
85d0c159b0 | |||
6294944952 | |||
abbb3255f8
|
@ -34,7 +34,7 @@ steps:
|
||||
from_secret: drone_abra-bot_token
|
||||
fork: true
|
||||
repositories:
|
||||
- coop-cloud/auto-recipes-catalogue-json
|
||||
- toolshed/auto-recipes-catalogue-json
|
||||
|
||||
trigger:
|
||||
event: tag
|
||||
|
@ -10,6 +10,7 @@ LETS_ENCRYPT_EMAIL=certs@example.com
|
||||
# DASHBOARD_ENABLED=true
|
||||
# WARN, INFO etc.
|
||||
LOG_LEVEL=WARN
|
||||
LOG_MAX_AGE=1
|
||||
|
||||
# This is here so later lines can extend it; you likely don't wanna edit
|
||||
COMPOSE_FILE="compose.yml"
|
||||
@ -147,7 +148,3 @@ COMPOSE_FILE="compose.yml"
|
||||
# NOTE(3wc): as of 2024-04-01 only the `icecast` recipe uses this
|
||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.web-alt.yml"
|
||||
#WEB_ALT_ENABLED=1
|
||||
|
||||
## Qbit
|
||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.qbit.yml"
|
||||
#QBIT_ENABLED=1
|
||||
|
@ -1,8 +0,0 @@
|
||||
version: "3.8"
|
||||
services:
|
||||
app:
|
||||
environment:
|
||||
- QBIT_ENABLED
|
||||
ports:
|
||||
- "6881:6881/udp"
|
||||
- "6881:6881/tcp"
|
11
compose.yml
11
compose.yml
@ -3,7 +3,7 @@ version: "3.8"
|
||||
|
||||
services:
|
||||
app:
|
||||
image: "traefik:v2.11.10"
|
||||
image: "traefik:v3.3.7"
|
||||
# Note(decentral1se): *please do not* add any additional ports here.
|
||||
# Doing so could break new installs with port conflicts. Please use
|
||||
# the usual `compose.$app.yml` approach for any additional ports
|
||||
@ -27,6 +27,7 @@ services:
|
||||
environment:
|
||||
- DASHBOARD_ENABLED
|
||||
- LOG_LEVEL
|
||||
- LOG_MAX_AGE
|
||||
healthcheck:
|
||||
test: ["CMD", "traefik", "healthcheck"]
|
||||
interval: 30s
|
||||
@ -47,12 +48,14 @@ services:
|
||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||
- "traefik.http.routers.${STACK_NAME}.service=api@internal"
|
||||
- "traefik.http.routers.${STACK_NAME}.middlewares=security@file"
|
||||
- "coop-cloud.${STACK_NAME}.version=2.8.0+v2.11.10"
|
||||
- "coop-cloud.${STACK_NAME}.version=3.1.0+v2.11.24"
|
||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
||||
|
||||
socket-proxy:
|
||||
image: lscr.io/linuxserver/socket-proxy:1.26.2-r0-ls26
|
||||
image: lscr.io/linuxserver/socket-proxy:1.26.2-r0-ls30
|
||||
deploy:
|
||||
endpoint_mode: dnsrr
|
||||
environment:
|
||||
- ALLOW_START=0
|
||||
- ALLOW_STOP=0
|
||||
@ -76,7 +79,7 @@ services:
|
||||
- SECRETS=0
|
||||
- SERVICES=1 # Needs access
|
||||
- SESSION=0
|
||||
- SWARM=0
|
||||
- SWARM=1
|
||||
- SYSTEM=0
|
||||
- TASKS=1 # Needs access
|
||||
- VERSION=1 # Needs access
|
||||
|
1
release/2.9.0+v2.11.14
Normal file
1
release/2.9.0+v2.11.14
Normal file
@ -0,0 +1 @@
|
||||
Closes Security Issue https://github.com/traefik/traefik/security/advisories/GHSA-h924-8g65-j9wg
|
1
release/2.9.1+v2.11.14
Normal file
1
release/2.9.1+v2.11.14
Normal file
@ -0,0 +1 @@
|
||||
Reverts max log retention
|
2
release/3.0.0+v2.11.22
Normal file
2
release/3.0.0+v2.11.22
Normal file
@ -0,0 +1,2 @@
|
||||
socket-proxy: switch to endpoint-mode dnsrr instead of vip
|
||||
See https://git.coopcloud.tech/coop-cloud/traefik/pulls/50.
|
@ -1,13 +1,16 @@
|
||||
---
|
||||
core:
|
||||
defaultRuleSyntax: v2
|
||||
|
||||
log:
|
||||
level: {{ env "LOG_LEVEL" }}
|
||||
maxAge: {{ env "LOG_MAX_AGE" }}
|
||||
|
||||
providers:
|
||||
docker:
|
||||
swarm:
|
||||
endpoint: "tcp://socket-proxy:2375"
|
||||
exposedByDefault: false
|
||||
network: proxy
|
||||
swarmMode: true
|
||||
{{ if eq (env "FILE_PROVIDER_DIRECTORY_ENABLED") "1" }}
|
||||
file:
|
||||
directory: /etc/traefik/file-providers
|
||||
@ -79,12 +82,6 @@ entrypoints:
|
||||
matrix-federation:
|
||||
address: ":9001"
|
||||
{{ end }}
|
||||
{{ if eq (env "QBIT_ENABLED") "1" }}
|
||||
qbit:
|
||||
address: ":6881"
|
||||
qbit-udp:
|
||||
address: ":6881/udp"
|
||||
{{ end }}
|
||||
|
||||
ping:
|
||||
entryPoint: web
|
||||
|
Reference in New Issue
Block a user