Compare commits

...

10 Commits

Author SHA1 Message Date
3wc
67867f24af Add preliminary DigitalOcean DNS support 2022-05-20 10:56:53 +00:00
df49a1f3b2 use domain env var 2022-03-27 21:12:16 +02:00
3wc
099dcfaed0 Add compy support 2022-03-26 23:49:10 +02:00
1d7542cd5f fix: drop minio config changes for now
New version is hard to config, unsure if this is needed.
2022-01-06 11:12:47 +01:00
5e1604322e fix: bump vendored config 2022-01-06 10:06:04 +01:00
36707989d2 fix: add missing entrypoints (matrix, minio) 2022-01-06 10:01:52 +01:00
29f90fe409 feat: minio port 2022-01-06 09:50:35 +01:00
8a48c5e507 chore: publish 1.0.1+v2.5.6 release 2021-12-28 03:38:36 +01:00
612d0cc6cc feat: matrix federation 2021-12-13 13:56:36 +01:00
36c7b740ab Merge pull request 'Add a slot for a second traefik-forward-auth' (#31) from forward-auth-2 into master
Reviewed-on: coop-cloud/traefik#31
2021-11-24 15:10:53 +00:00
10 changed files with 69 additions and 7 deletions

View File

@ -1,6 +1,6 @@
TYPE=traefik
DOMAIN=traefik.example.com
DOMAIN={{ .Domain }}
LETS_ENCRYPT_ENV=production
LETS_ENCRYPT_EMAIL=certs@example.com
@ -44,6 +44,11 @@ COMPOSE_FILE="compose.yml"
#GANDI_ENABLED=1
#SECRET_GANDIV5_API_KEY_VERSION=v1
## DigitalOcean, https://digitalocean.com
#COMPOSE_FILE="$COMPOSE_FILE:compose.digitalocean.yml"
#DIGITALOCEAN_ENABLED=1
#SECRET_DIGITALOCEAN_AUTH_TOKEN_VERSION=v1
#####################################################################
# Keycloak log-in #
#####################################################################
@ -71,6 +76,10 @@ COMPOSE_FILE="compose.yml"
#COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
#SMTP_ENABLED=1
## Compy
#COMPOSE_FILE="$COMPOSE_FILE:compose.compy.yml"
#COMPY_ENABLED=1
## Gitea SSH
# COMPOSE_FILE="$COMPOSE_FILE:compose.gitea.yml"
# GITEA_SSH_ENABLED=1
@ -94,3 +103,7 @@ COMPOSE_FILE="compose.yml"
## Mumble
#COMPOSE_FILE="$COMPOSE_FILE:compose.mumble.yml"
#MUMBLE_ENABLED=1
## Matrix
#COMPOSE_FILE="$COMPOSE_FILE:compose.matrix.yml"
#MATRIX_FEDERATION_ENABLED=1

View File

@ -1,3 +1,3 @@
export TRAEFIK_YML_VERSION=v12
export FILE_PROVIDER_YML_VERSION=v6
export ENTRYPOINT_VERSION=v2
export TRAEFIK_YML_VERSION=v15
export FILE_PROVIDER_YML_VERSION=v7
export ENTRYPOINT_VERSION=v3

7
compose.compy.yml Normal file
View File

@ -0,0 +1,7 @@
version: "3.8"
services:
app:
environment:
- COMPY_ENABLED
ports:
- "9999:9999"

15
compose.digitalocean.yml Normal file
View File

@ -0,0 +1,15 @@
version: "3.8"
services:
app:
environment:
- DO_AUTH_TOKEN_FILE=/run/secrets/digitalocean_auth_token
- LETS_ENCRYPT_DNS_CHALLENGE_ENABLED
- LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER
secrets:
- digitalocean_auth_token
secrets:
digitalocean_auth_token:
name: ${STACK_NAME}_digitalocean_auth_token_${SECRET_DIGITALOCEAN_AUTH_TOKEN_VERSION}
external: true

View File

@ -12,4 +12,3 @@ services:
- "traefik.http.services.traefik.loadbalancer.server.port=web"
- "traefik.http.routers.traefik.entrypoints=web-secure"
- "traefik.http.routers.traefik.service=api@internal"
- "coop-cloud.${STACK_NAME}.app.version=v2.4.9-be23e1f6"

7
compose.matrix.yml Normal file
View File

@ -0,0 +1,7 @@
version: "3.8"
services:
app:
environment:
- MATRIX_FEDERATION_ENABLED
ports:
- "8448:8448"

9
compose.minio.yml Normal file
View File

@ -0,0 +1,9 @@
---
version: "3.8"
services:
app:
environment:
- MINIO_CONSOLE_ENABLED
ports:
- "9001:9001"

View File

@ -3,7 +3,7 @@ version: "3.8"
services:
app:
image: "traefik:v2.5.2"
image: "traefik:v2.5.6"
# 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,7 +47,7 @@ services:
- "traefik.http.routers.traefik.tls.options=default@file"
- "traefik.http.routers.traefik.service=api@internal"
- "traefik.http.routers.traefik.middlewares=security@file"
- "coop-cloud.${STACK_NAME}.version=1.0.0+v2.5.2"
- "coop-cloud.${STACK_NAME}.version=1.0.1+v2.5.6"
networks:
proxy:

View File

@ -11,4 +11,8 @@ export OVH_APPLICATION_SECRET=$(cat "$OVH_APPLICATION_SECRET_FILE")
export GANDIV5_API_KEY=$(cat "$GANDIV5_API_KEY_FILE")
{{ end }}
{{ if eq (env "DIGITALOCEAN_ENABLED") "1" }}
export DO_AUTH_TOKEN=$(cat "$DO_AUTH_TOKEN_FILE")
{{ end }}
/entrypoint.sh "$@"

View File

@ -54,10 +54,18 @@ entrypoints:
mumble-udp:
address: ":64738/udp"
{{ end }}
{{ if eq (env "COMPY_ENABLED") "1" }}
compy:
address: ":9999"
{{ end }}
{{ if eq (env "METRICS_ENABLED") "1" }}
metrics:
address: ":8082"
{{ end }}
{{ if eq (env "MATRIX_FEDERATION_ENABLED") "1" }}
matrix-federation:
address: ":9001"
{{ end }}
ping:
entryPoint: web