Compare commits
2 Commits
revert-log
...
master
Author | SHA1 | Date | |
---|---|---|---|
91ca64b71e | |||
8be9f387e5 |
@ -34,7 +34,7 @@ steps:
|
|||||||
from_secret: drone_abra-bot_token
|
from_secret: drone_abra-bot_token
|
||||||
fork: true
|
fork: true
|
||||||
repositories:
|
repositories:
|
||||||
- coop-cloud/auto-recipes-catalogue-json
|
- toolshed/auto-recipes-catalogue-json
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
event: tag
|
event: tag
|
||||||
|
@ -10,7 +10,6 @@ LETS_ENCRYPT_EMAIL=certs@example.com
|
|||||||
# DASHBOARD_ENABLED=true
|
# DASHBOARD_ENABLED=true
|
||||||
# WARN, INFO etc.
|
# WARN, INFO etc.
|
||||||
LOG_LEVEL=WARN
|
LOG_LEVEL=WARN
|
||||||
LOG_MAX_AGE=0
|
|
||||||
|
|
||||||
# This is here so later lines can extend it; you likely don't wanna edit
|
# This is here so later lines can extend it; you likely don't wanna edit
|
||||||
COMPOSE_FILE="compose.yml"
|
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
|
# NOTE(3wc): as of 2024-04-01 only the `icecast` recipe uses this
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.web-alt.yml"
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.web-alt.yml"
|
||||||
#WEB_ALT_ENABLED=1
|
#WEB_ALT_ENABLED=1
|
||||||
|
|
||||||
|
## Zulip
|
||||||
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.zulip.yml"
|
||||||
|
#ZULIP_HTTPS_PROXY_ENABLED=1
|
2
abra.sh
2
abra.sh
@ -1,3 +1,3 @@
|
|||||||
export TRAEFIK_YML_VERSION=v22
|
export TRAEFIK_YML_VERSION=v21
|
||||||
export FILE_PROVIDER_YML_VERSION=v10
|
export FILE_PROVIDER_YML_VERSION=v10
|
||||||
export ENTRYPOINT_VERSION=v4
|
export ENTRYPOINT_VERSION=v4
|
||||||
|
@ -27,7 +27,6 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
- DASHBOARD_ENABLED
|
- DASHBOARD_ENABLED
|
||||||
- LOG_LEVEL
|
- LOG_LEVEL
|
||||||
- LOG_MAX_AGE=${LOG_MAX_AGE:0}
|
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "traefik", "healthcheck"]
|
test: ["CMD", "traefik", "healthcheck"]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
@ -48,7 +47,7 @@ services:
|
|||||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||||
- "traefik.http.routers.${STACK_NAME}.service=api@internal"
|
- "traefik.http.routers.${STACK_NAME}.service=api@internal"
|
||||||
- "traefik.http.routers.${STACK_NAME}.middlewares=security@file"
|
- "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}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||||
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
||||||
|
|
||||||
|
6
compose.zulip.yml
Normal file
6
compose.zulip.yml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
version: "3.8"
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
deploy:
|
||||||
|
labels:
|
||||||
|
- "traefik.http.services.${STACK_NAME}.loadBalancer.serversTransport=zulip@file"
|
@ -1,5 +1,10 @@
|
|||||||
---
|
---
|
||||||
http:
|
http:
|
||||||
|
{{ if eq (env "ZULIP_HTTPS_PROXY_ENABLED") "1" }}
|
||||||
|
serversTransports:
|
||||||
|
zulip:
|
||||||
|
insecureSkipVerify: true
|
||||||
|
{{ end }}
|
||||||
middlewares:
|
middlewares:
|
||||||
{{ if eq (env "KEYCLOAK_MIDDLEWARE_ENABLED") "1" }}
|
{{ if eq (env "KEYCLOAK_MIDDLEWARE_ENABLED") "1" }}
|
||||||
keycloak:
|
keycloak:
|
||||||
|
@ -1 +0,0 @@
|
|||||||
Adds log retention configuration option
|
|
@ -1,8 +1,6 @@
|
|||||||
---
|
---
|
||||||
log:
|
log:
|
||||||
level: {{ env "LOG_LEVEL" }}
|
level: {{ env "LOG_LEVEL" }}
|
||||||
maxAge: {{ env "LOG_MAX_AGE" }}
|
|
||||||
|
|
||||||
|
|
||||||
providers:
|
providers:
|
||||||
docker:
|
docker:
|
||||||
|
Reference in New Issue
Block a user