Compare commits

..

2 Commits

8 changed files with 18 additions and 8 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

@ -10,7 +10,6 @@ LETS_ENCRYPT_EMAIL=certs@example.com
# DASHBOARD_ENABLED=true
# WARN, INFO etc.
LOG_LEVEL=WARN
LOG_MAX_AGE=0
# This is here so later lines can extend it; you likely don't wanna edit
COMPOSE_FILE="compose.yml"
@ -148,3 +147,7 @@ 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
## 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

@ -27,7 +27,6 @@ services:
environment:
- DASHBOARD_ENABLED
- LOG_LEVEL
- LOG_MAX_AGE=${LOG_MAX_AGE:0}
healthcheck:
test: ["CMD", "traefik", "healthcheck"]
interval: 30s
@ -48,7 +47,7 @@ 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=3.1.0+v2.11.14"
- "coop-cloud.${STACK_NAME}.version=2.9.0+v2.11.14"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
- "backupbot.backup=${ENABLE_BACKUPS:-true}"

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:

View File

@ -1 +0,0 @@
Adds log retention configuration option

View File

@ -1,8 +1,6 @@
---
log:
level: {{ env "LOG_LEVEL" }}
maxAge: {{ env "LOG_MAX_AGE" }}
providers:
docker: