Compare commits

...

30 Commits

Author SHA1 Message Date
b209bbb2d1 attempt using staticresponse 2023-04-10 12:45:19 +12:00
0a050e5977 attempt at adding error pages 2023-04-10 11:26:59 +12:00
a7bff09db6 chore: publish 2.1.0+v2.9.9 release
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2023-04-04 18:26:39 +02:00
3wc
6167d41588 Add DNS challenge / wildcard instructions to README.md
[ci skip]
2023-03-06 20:58:19 -05:00
31330d967b chore: publish 2.0.4+v2.9.6 release
All checks were successful
continuous-integration/drone/push Build is passing
2023-02-13 17:09:40 +01:00
f23357c9cd fix: remove invalid tls label
Some checks failed
continuous-integration/drone/pr Build is failing
continuous-integration/drone/push Build is passing
See coop-cloud/organising#412
2023-02-13 11:16:07 +01:00
3wc
b6bb286282 Switch to self-hosted stack-ssh-deploy image [mass update]
All checks were successful
continuous-integration/drone/push Build is passing
2023-01-21 11:49:56 -08:00
3wc
14a34c7b7f Fix CI by adding networks: [mass update]
All checks were successful
continuous-integration/drone/push Build is passing
2023-01-20 11:58:41 -08:00
3wc
39bfdb4c82 Automatically generate catalogue on release [mass update]
Some checks failed
continuous-integration/drone/push Build is failing
Re: coop-cloud/recipes-catalogue-json#4
2023-01-20 10:27:12 -08:00
3wc
1d43c68274 Update abra syntax in examples (finally) [mass update]
Some checks failed
continuous-integration/drone/push Build is failing
2023-01-19 16:02:28 -08:00
f1cfb814dd chore: publish 2.0.3+v2.9.6 release
Some checks failed
continuous-integration/drone/push Build is failing
2023-01-18 13:48:37 -08:00
ece8807959 chore: publish 2.0.2+v2.9.5 release
Some checks failed
continuous-integration/drone/push Build is failing
2022-12-02 11:09:17 +01:00
3wc
a1e75e8c8b Revert to traefik.example.com templating
Some checks failed
continuous-integration/drone/push Build is failing
2022-11-16 20:35:34 -08:00
b62cb273ef Merge pull request 'Up versions to latest stable and one ping less to Google' (#38) from javielico/traefik:master into master
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #38
2022-11-11 19:32:15 +00:00
5f25a272cb One ping less to Google, swap for Quad9
Some checks failed
continuous-integration/drone/pr Build is failing
2022-11-11 17:02:09 +00:00
4c7a272838 Up version to 2.9.4 2022-11-11 16:59:00 +00:00
3wc
2e68186042 chore: publish 2.0.0+v2.9.1 release
Some checks failed
continuous-integration/drone/push Build is failing
2022-10-18 17:09:44 -04:00
3wc
975d8e01a4 Use $STACK_NAME for default router name..
Some checks failed
continuous-integration/drone/push Build is failing
..instead of hard-coded `traefik`
2022-10-18 17:06:11 -04:00
fcff3a2d6a syntax
Some checks failed
continuous-integration/drone/push Build is failing
minor
2022-10-13 16:51:46 +00:00
981d2a3808 chore: publish 1.1.1+v2.8.1 release
Some checks failed
continuous-integration/drone/push Build is failing
2022-07-14 10:47:58 +02:00
29eb1058cd chore: publish 1.1.0+v2.8.0 release
Some checks failed
continuous-integration/drone/push Build is failing
2022-07-01 11:35:28 +02:00
df49a1f3b2 use domain env var
Some checks failed
continuous-integration/drone/push Build is failing
2022-03-27 21:12:16 +02:00
3wc
099dcfaed0 Add compy support
Some checks failed
continuous-integration/drone/push Build is failing
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: #31
2021-11-24 15:10:53 +00:00
11 changed files with 122 additions and 22 deletions

View File

@ -3,10 +3,12 @@ kind: pipeline
name: deploy to swarm-test.autonomic.zone name: deploy to swarm-test.autonomic.zone
steps: steps:
- name: deployment - name: deployment
image: decentral1se/stack-ssh-deploy:latest image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
settings: settings:
host: swarm-test.autonomic.zone host: swarm-test.autonomic.zone
stack: traefik stack: traefik
networks:
- proxy
deploy_key: deploy_key:
from_secret: drone_ssh_swarm_test from_secret: drone_ssh_swarm_test
environment: environment:
@ -22,11 +24,17 @@ trigger:
- master - master
--- ---
kind: pipeline kind: pipeline
name: recipe release name: generate recipe catalogue
steps: steps:
- name: release a new version - name: release a new version
image: thecoopcloud/drone-abra:latest image: plugins/downstream
settings: settings:
command: recipe traefik release server: https://build.coopcloud.tech
deploy_key: token:
from_secret: abra_bot_deploy_key from_secret: drone_abra-bot_token
fork: true
repositories:
- coop-cloud/auto-recipes-catalogue-json
trigger:
event: tag

View File

@ -15,6 +15,9 @@ COMPOSE_FILE="compose.yml"
# General settings # # General settings #
##################################################################### #####################################################################
## Error pages
COMPOSE_FILE="$COMPOSE_FILE:compose.error-pages.yml"
## Host-mode networking ## Host-mode networking
#COMPOSE_FILE="$COMPOSE_FILE:compose.host.yml" #COMPOSE_FILE="$COMPOSE_FILE:compose.host.yml"
@ -71,6 +74,10 @@ COMPOSE_FILE="compose.yml"
#COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml" #COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
#SMTP_ENABLED=1 #SMTP_ENABLED=1
## Compy
#COMPOSE_FILE="$COMPOSE_FILE:compose.compy.yml"
#COMPY_ENABLED=1
## Gitea SSH ## Gitea SSH
# COMPOSE_FILE="$COMPOSE_FILE:compose.gitea.yml" # COMPOSE_FILE="$COMPOSE_FILE:compose.gitea.yml"
# GITEA_SSH_ENABLED=1 # GITEA_SSH_ENABLED=1
@ -94,3 +101,7 @@ COMPOSE_FILE="compose.yml"
## Mumble ## Mumble
#COMPOSE_FILE="$COMPOSE_FILE:compose.mumble.yml" #COMPOSE_FILE="$COMPOSE_FILE:compose.mumble.yml"
#MUMBLE_ENABLED=1 #MUMBLE_ENABLED=1
## Matrix
#COMPOSE_FILE="$COMPOSE_FILE:compose.matrix.yml"
#MATRIX_FEDERATION_ENABLED=1

View File

@ -19,8 +19,29 @@
1. Set up Docker Swarm and [`abra`] 1. Set up Docker Swarm and [`abra`]
2. `abra app new traefik` 2. `abra app new traefik`
3. `abra app YOURAPPDOMAIN config` - be sure to change `DOMAIN` to something that resolves to 3. `abra app config YOURAPPDOMAIN` - be sure to change `DOMAIN` to something that resolves to
your Docker swarm box your Docker swarm box
4. `abra app YOURAPPDOMAIN deploy` 4. `abra app deploy YOURAPPDOMAIN`
## Configuring wildcard SSL using DNS
Automatic certificate generation will Just Work™ for most recipes which use a fixed
number of subdomains. For some recipes which need to work across arbitrary
subdomains, like
[`federatedwiki`](https://git.coopcloud.tech/coop-cloud/federatedwiki/) and
[`go-ssb-room`](https://git.coopcloud.tech/coop-cloud/federatedwiki/), you'll
need to give Traefik access to your DNS provider so that it can carry out
Letsencrypt DNS challenges.
1. Use Gandi or OVH for DNS 🤡 (support for other providers can be easily added,
see [the `lego` docs](https://go-acme.github.io/lego/dns/#dns-providers).
2. Run `abra app config YOURAPPDOMAIN`
3. Uncomment e.g. `ENABLE_GANDI` and the related `SECRET_.._VERSION` line, e.g.
`SECRET_GANDIV5_API_KEY_VERSION`
4. Generate an API key for your provider
5. Run `abra app secret insert YOURAPPDOMAIN SECRETNAME v1 SECRETVALUE`, where
`SECRETNAME` is from the compose file (e.g. `compose.gandi.yml`) e.g.
`gandiv5_api_key` and `SECRETVALUE` is the API key.
6. Redeploy Traefik, using e.g. `abra app deploy YOURAPPDOMAIN -f`
[`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra [`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra

View File

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

7
compose.compy.yml Normal file
View File

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

31
compose.error-pages.yml Normal file
View File

@ -0,0 +1,31 @@
version: '3.8'
services:
app:
command:
- --providers.docker
- --experimental.plugins.staticresponse.modulename=github.com/jdel/staticresponse
- --experimental.plugins.staticresponse.version=v0.0.1
deploy:
labels:
# custom traefik errors
- "traefik.http.middlewares.web-secure.errors.status=400-599"
- "traefik.http.middlewares.web-secure.errors.service=down-rule"
- "traefik.http.middlewares.web-secure.errors.query=/traefik-http-error/{status}"
# catchall rule
- "traefik.http.routers.http-catchall.entrypoints=web-secure"
- "traefik.http.routers.http-catchall.rule=PathPrefix(`/`)"
# lowest possible priority, evaluated when no other router is matched
- "traefik.http.routers.http-catchall.priority=1"
- "traefik.http.routers.http-catchall.middlewares=503down"
# static error message
- "traefik.http.middlewares.503down.plugin.staticresponse"
- "traefik.http.middlewares.503down.plugin.staticresponse.StatusCode=503"
- "traefik.http.middlewares.503down.plugin.staticresponse.Body=Sorry, currently under maintenance. Please try again later."
# error page
- "traefik.http.routers.down-rule.rule=PathPrefix(`/traefik-http-error`)"
- "traefik.http.routers.down-rule.service=noop@internal"
- "traefik.http.routers.down-rule.entrypoints=web-secure"
- "traefik.http.routers.down-rule.middlewares=503down"

View File

@ -10,6 +10,5 @@ services:
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.services.traefik.loadbalancer.server.port=web" - "traefik.http.services.traefik.loadbalancer.server.port=web"
- "traefik.http.routers.traefik.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
- "traefik.http.routers.traefik.service=api@internal" - "traefik.http.routers.${STACK_NAME}.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: services:
app: app:
image: "traefik:v2.5.2" image: "traefik:v2.9.9"
# Note(decentral1se): *please do not* add any additional ports here. # Note(decentral1se): *please do not* add any additional ports here.
# Doing so could break new installs with port conflicts. Please use # Doing so could break new installs with port conflicts. Please use
# the usual `compose.$app.yml` approach for any additional ports # the usual `compose.$app.yml` approach for any additional ports
@ -40,14 +40,13 @@ services:
order: start-first order: start-first
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.services.traefik.loadbalancer.server.port=web" - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=web"
- "traefik.http.routers.traefik.rule=Host(`${DOMAIN}`)" - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
- "traefik.http.routers.traefik.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
- "traefik.http.routers.traefik.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "traefik.http.routers.traefik.tls.options=default@file" - "traefik.http.routers.${STACK_NAME}.service=api@internal"
- "traefik.http.routers.traefik.service=api@internal" - "traefik.http.routers.${STACK_NAME}.middlewares=security@file"
- "traefik.http.routers.traefik.middlewares=security@file" - "coop-cloud.${STACK_NAME}.version=2.1.0+v2.9.9"
- "coop-cloud.${STACK_NAME}.version=1.0.0+v2.5.2"
networks: networks:
proxy: proxy:

View File

@ -54,10 +54,18 @@ entrypoints:
mumble-udp: mumble-udp:
address: ":64738/udp" address: ":64738/udp"
{{ end }} {{ end }}
{{ if eq (env "COMPY_ENABLED") "1" }}
compy:
address: ":9999"
{{ end }}
{{ if eq (env "METRICS_ENABLED") "1" }} {{ if eq (env "METRICS_ENABLED") "1" }}
metrics: metrics:
address: ":8082" address: ":8082"
{{ end }} {{ end }}
{{ if eq (env "MATRIX_FEDERATION_ENABLED") "1" }}
matrix-federation:
address: ":9001"
{{ end }}
ping: ping:
entryPoint: web entryPoint: web
@ -94,5 +102,5 @@ certificatesResolvers:
provider: {{ (env "LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER") }} provider: {{ (env "LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER") }}
resolvers: resolvers:
- "1.1.1.1:53" - "1.1.1.1:53"
- "8.8.8.8:53" - "9.9.9.9:53"
{{ end }} {{ end }}