Compare commits

...

8 Commits

Author SHA1 Message Date
b7ea50d6aa chore: publish 2.6.3+v2.11.2 release
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/tag Build is passing
2024-04-14 21:38:48 +01:00
af33ec8510 chore: publish 2.6.2+v2.11.1 release
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/tag Build is passing
2024-04-14 21:36:25 +01:00
685d32baf1 Merge pull request 'Add preliminary DigitalOcean DNS support' (#36) from digitalocean-dns into master
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #36
2024-04-06 18:00:38 +00:00
3wc
e76d61be00 Add preliminary DigitalOcean DNS support
Some checks failed
continuous-integration/drone/pr Build is failing
2024-04-06 15:00:06 -03:00
3wc
daec338066 Another Drone fix?
All checks were successful
continuous-integration/drone/push Build is passing
2024-04-06 14:53:41 -03:00
3wc
e92e76ac88 Fix Drone CI
Some checks failed
continuous-integration/drone/push Build is failing
2024-04-06 14:52:55 -03:00
3wc
70d10587bc chore: publish 2.6.1+v2.11.0 release
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/tag Build is passing
2024-04-06 14:36:21 -03:00
3wc
bdf84fcefd Reinstate missing HTTP->HTTPS redirect 2024-04-06 14:35:53 -03:00
7 changed files with 35 additions and 7 deletions

View File

@ -16,8 +16,8 @@ steps:
STACK_NAME: traefik STACK_NAME: traefik
LETS_ENCRYPT_ENV: production LETS_ENCRYPT_ENV: production
LETS_ENCRYPT_EMAIL: helo@autonomic.zone LETS_ENCRYPT_EMAIL: helo@autonomic.zone
TRAEFIK_YML_VERSION: v4 TRAEFIK_YML_VERSION: v5
FILE_PROVIDER_YML_VERSION: v3 FILE_PROVIDER_YML_VERSION: v4
ENTRYPOINT_VERSION: v1 ENTRYPOINT_VERSION: v1
trigger: trigger:
branch: branch:

View File

@ -46,6 +46,11 @@ COMPOSE_FILE="compose.yml"
#GANDI_ENABLED=1 #GANDI_ENABLED=1
#SECRET_GANDIV5_API_KEY_VERSION=v1 #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
##################################################################### #####################################################################
# Manual wildcard certificate insertion # # Manual wildcard certificate insertion #
##################################################################### #####################################################################

View File

@ -1,3 +1,3 @@
export TRAEFIK_YML_VERSION=v19 export TRAEFIK_YML_VERSION=v20
export FILE_PROVIDER_YML_VERSION=v9 export FILE_PROVIDER_YML_VERSION=v10
export ENTRYPOINT_VERSION=v2 export ENTRYPOINT_VERSION=v3

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

@ -3,7 +3,7 @@ version: "3.8"
services: services:
app: app:
image: "traefik:v2.11.0" image: "traefik:v2.11.2"
# 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
@ -47,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=2.6.0+v2.11.0" - "coop-cloud.${STACK_NAME}.version=2.6.3+v2.11.2"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
networks: networks:

View File

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

View File

@ -24,6 +24,10 @@ api:
entrypoints: entrypoints:
web: web:
address: ":80" address: ":80"
http:
redirections:
entryPoint:
to: web-secure
web-secure: web-secure:
address: ":443" address: ":443"
{{ if eq (env "GITEA_SSH_ENABLED") "1" }} {{ if eq (env "GITEA_SSH_ENABLED") "1" }}