Compare commits
2 Commits
master
...
endpoint-m
Author | SHA1 | Date | |
---|---|---|---|
fca735102a | |||
f652230317 |
@ -8,7 +8,7 @@ steps:
|
|||||||
host: swarm-test.autonomic.zone
|
host: swarm-test.autonomic.zone
|
||||||
stack: traefik
|
stack: traefik
|
||||||
networks:
|
networks:
|
||||||
- proxy
|
- proxy
|
||||||
deploy_key:
|
deploy_key:
|
||||||
from_secret: drone_ssh_swarm_test
|
from_secret: drone_ssh_swarm_test
|
||||||
environment:
|
environment:
|
||||||
@ -16,7 +16,7 @@ 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: v22
|
TRAEFIK_YML_VERSION: v21
|
||||||
FILE_PROVIDER_YML_VERSION: v10
|
FILE_PROVIDER_YML_VERSION: v10
|
||||||
ENTRYPOINT_VERSION: v4
|
ENTRYPOINT_VERSION: v4
|
||||||
trigger:
|
trigger:
|
||||||
@ -34,7 +34,7 @@ steps:
|
|||||||
from_secret: drone_abra-bot_token
|
from_secret: drone_abra-bot_token
|
||||||
fork: true
|
fork: true
|
||||||
repositories:
|
repositories:
|
||||||
- toolshed/auto-recipes-catalogue-json
|
- coop-cloud/auto-recipes-catalogue-json
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
event: tag
|
event: tag
|
||||||
|
15
.env.sample
15
.env.sample
@ -58,17 +58,6 @@ COMPOSE_FILE="compose.yml"
|
|||||||
#DIGITALOCEAN_ENABLED=1
|
#DIGITALOCEAN_ENABLED=1
|
||||||
#SECRET_DIGITALOCEAN_AUTH_TOKEN_VERSION=v1
|
#SECRET_DIGITALOCEAN_AUTH_TOKEN_VERSION=v1
|
||||||
|
|
||||||
## Azure, https://azure.com
|
|
||||||
## To insert your Azure client secret:
|
|
||||||
## abra app secret insert {myapp.example.coop} azure_secret v1 "<CLIENT_SECRET>"
|
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.azure.yml"
|
|
||||||
#AZURE_ENABLED=1
|
|
||||||
#AZURE_TENANT_ID=
|
|
||||||
#AZURE_CLIENT_ID=
|
|
||||||
#AZURE_SUBSCRIPTION_ID=
|
|
||||||
#AZURE_RESOURCE_GROUP=
|
|
||||||
#SECRET_AZURE_SECRET_VERSION=v1
|
|
||||||
|
|
||||||
#####################################################################
|
#####################################################################
|
||||||
# Manual wildcard certificate insertion #
|
# Manual wildcard certificate insertion #
|
||||||
#####################################################################
|
#####################################################################
|
||||||
@ -158,7 +147,3 @@ 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
|
||||||
|
|
||||||
## Matrix
|
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.irc.yml"
|
|
||||||
#IRC_ENABLED=1
|
|
||||||
|
2
abra.sh
2
abra.sh
@ -1,3 +1,3 @@
|
|||||||
export TRAEFIK_YML_VERSION=v23
|
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
|
||||||
|
@ -1,17 +0,0 @@
|
|||||||
version: "3.8"
|
|
||||||
|
|
||||||
services:
|
|
||||||
app:
|
|
||||||
environment:
|
|
||||||
- AZURE_TENANT_ID
|
|
||||||
- AZURE_CLIENT_ID
|
|
||||||
- AZURE_SUBSCRIPTION_ID
|
|
||||||
- AZURE_RESOURCE_GROUP
|
|
||||||
- AZURE_CLIENT_SECRET_FILE=/run/secrets/azure_secret
|
|
||||||
secrets:
|
|
||||||
- azure_secret
|
|
||||||
|
|
||||||
secrets:
|
|
||||||
azure_secret:
|
|
||||||
name: ${STACK_NAME}_azure_secret_${SECRET_AZURE_SECRET_VERSION}
|
|
||||||
external: true
|
|
@ -1,7 +0,0 @@
|
|||||||
version: "3.8"
|
|
||||||
services:
|
|
||||||
app:
|
|
||||||
environment:
|
|
||||||
- IRC_ENABLED
|
|
||||||
ports:
|
|
||||||
- "6697:6697"
|
|
@ -3,7 +3,7 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: "traefik:v3.4.5"
|
image: "traefik:v2.11.14"
|
||||||
# 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=3.5.0+v3.4.5"
|
- "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}"
|
||||||
|
|
||||||
@ -78,7 +78,7 @@ services:
|
|||||||
- SECRETS=0
|
- SECRETS=0
|
||||||
- SERVICES=1 # Needs access
|
- SERVICES=1 # Needs access
|
||||||
- SESSION=0
|
- SESSION=0
|
||||||
- SWARM=1
|
- SWARM=0
|
||||||
- SYSTEM=0
|
- SYSTEM=0
|
||||||
- TASKS=1 # Needs access
|
- TASKS=1 # Needs access
|
||||||
- VERSION=1 # Needs access
|
- VERSION=1 # Needs access
|
||||||
|
@ -11,8 +11,4 @@ export OVH_APPLICATION_SECRET=$(cat "$OVH_APPLICATION_SECRET_FILE")
|
|||||||
export DO_AUTH_TOKEN=$(cat "$DO_AUTH_TOKEN_FILE")
|
export DO_AUTH_TOKEN=$(cat "$DO_AUTH_TOKEN_FILE")
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
{{ if eq (env "AZURE_ENABLED") "1" }}
|
|
||||||
export AZURE_CLIENT_SECRET=$(cat "$AZURE_CLIENT_SECRET_FILE")
|
|
||||||
{{ end }}
|
|
||||||
|
|
||||||
/entrypoint.sh "$@"
|
/entrypoint.sh "$@"
|
||||||
|
@ -1 +0,0 @@
|
|||||||
Reverts max log retention
|
|
@ -1,2 +0,0 @@
|
|||||||
socket-proxy: switch to endpoint-mode dnsrr instead of vip
|
|
||||||
See https://git.coopcloud.tech/coop-cloud/traefik/pulls/50.
|
|
@ -1 +0,0 @@
|
|||||||
Fix CVE: https://github.com/traefik/traefik/security/advisories/GHSA-vrch-868g-9jx5
|
|
@ -1 +0,0 @@
|
|||||||
Updates Traefik from v2 to v3. Migration notes here: https://doc.traefik.io/traefik/migration/v2-to-v3-details/#configuration-details-for-migrating-from-traefik-v2-to-v3 By default, syntax for Traefik rules in recipes still use v2 syntax. To upgrade a recipe to use v3 label syntax, set the ruleSyntax label in the recipe per: https://doc.traefik.io/traefik/reference/routing-configuration/http/router/rules-and-priority/#rulesyntax
|
|
@ -1 +0,0 @@
|
|||||||
Bumps the TRAEFIK_YML_VERSION
|
|
@ -1 +0,0 @@
|
|||||||
Add support to azure DNS-01 acme challenge
|
|
@ -1,15 +1,13 @@
|
|||||||
---
|
---
|
||||||
core:
|
|
||||||
defaultRuleSyntax: v2
|
|
||||||
|
|
||||||
log:
|
log:
|
||||||
level: {{ env "LOG_LEVEL" }}
|
level: {{ env "LOG_LEVEL" }}
|
||||||
|
|
||||||
providers:
|
providers:
|
||||||
swarm:
|
docker:
|
||||||
endpoint: "tcp://socket-proxy:2375"
|
endpoint: "tcp://socket-proxy:2375"
|
||||||
exposedByDefault: false
|
exposedByDefault: false
|
||||||
network: proxy
|
network: proxy
|
||||||
|
swarmMode: true
|
||||||
{{ if eq (env "FILE_PROVIDER_DIRECTORY_ENABLED") "1" }}
|
{{ if eq (env "FILE_PROVIDER_DIRECTORY_ENABLED") "1" }}
|
||||||
file:
|
file:
|
||||||
directory: /etc/traefik/file-providers
|
directory: /etc/traefik/file-providers
|
||||||
@ -70,10 +68,6 @@ entrypoints:
|
|||||||
compy:
|
compy:
|
||||||
address: ":9999"
|
address: ":9999"
|
||||||
{{ end }}
|
{{ end }}
|
||||||
{{ if eq (env "IRC_ENABLED") "1" }}
|
|
||||||
irc:
|
|
||||||
address: ":6697"
|
|
||||||
{{ end }}
|
|
||||||
{{ if eq (env "METRICS_ENABLED") "1" }}
|
{{ if eq (env "METRICS_ENABLED") "1" }}
|
||||||
metrics:
|
metrics:
|
||||||
address: ":8082"
|
address: ":8082"
|
||||||
|
Reference in New Issue
Block a user