Compare commits

..

4 Commits

9 changed files with 20 additions and 19 deletions

View File

@ -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

View File

@ -148,6 +148,6 @@ COMPOSE_FILE="compose.yml"
#COMPOSE_FILE="$COMPOSE_FILE:compose.web-alt.yml"
#WEB_ALT_ENABLED=1
## Matrix
#COMPOSE_FILE="$COMPOSE_FILE:compose.irc.yml"
#IRC_ENABLED=1
## Zulip
#COMPOSE_FILE="$COMPOSE_FILE:compose.zulip.yml"
#ZULIP_HTTPS_PROXY_ENABLED=1

View File

@ -1,3 +1,3 @@
export TRAEFIK_YML_VERSION=v22
export TRAEFIK_YML_VERSION=v21
export FILE_PROVIDER_YML_VERSION=v10
export ENTRYPOINT_VERSION=v4

View File

@ -1,7 +0,0 @@
version: "3.8"
services:
app:
environment:
- IRC_ENABLED
ports:
- "6697:6697"

View File

@ -3,7 +3,7 @@ version: "3.8"
services:
app:
image: "traefik:v2.11.10"
image: "traefik:v2.11.14"
# 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
@ -47,12 +47,12 @@ 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=2.9.0+v2.11.14"
- "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
environment:
- ALLOW_START=0
- ALLOW_STOP=0

6
compose.zulip.yml Normal file
View File

@ -0,0 +1,6 @@
version: "3.8"
services:
app:
deploy:
labels:
- "traefik.http.services.${STACK_NAME}.loadBalancer.serversTransport=zulip@file"

View File

@ -1,5 +1,10 @@
---
http:
{{ if eq (env "ZULIP_HTTPS_PROXY_ENABLED") "1" }}
serversTransports:
zulip:
insecureSkipVerify: true
{{ end }}
middlewares:
{{ if eq (env "KEYCLOAK_MIDDLEWARE_ENABLED") "1" }}
keycloak:

1
release/2.9.0+v2.11.14 Normal file
View File

@ -0,0 +1 @@
Closes Security Issue https://github.com/traefik/traefik/security/advisories/GHSA-h924-8g65-j9wg

View File

@ -68,10 +68,6 @@ entrypoints:
compy:
address: ":9999"
{{ end }}
{{ if eq (env "IRC_ENABLED") "1" }}
irc:
address: ":6697"
{{ end }}
{{ if eq (env "METRICS_ENABLED") "1" }}
metrics:
address: ":8082"