forked from coop-cloud/traefik
		
	Compare commits
	
		
			2 Commits
		
	
	
		
			2.6.2+v2.1
			...
			error-mess
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| b209bbb2d1 | |||
| 0a050e5977 | 
| @ -16,8 +16,8 @@ steps: | ||||
|       STACK_NAME: traefik | ||||
|       LETS_ENCRYPT_ENV: production | ||||
|       LETS_ENCRYPT_EMAIL: helo@autonomic.zone | ||||
|       TRAEFIK_YML_VERSION: v5 | ||||
|       FILE_PROVIDER_YML_VERSION: v4 | ||||
|       TRAEFIK_YML_VERSION: v4 | ||||
|       FILE_PROVIDER_YML_VERSION: v3 | ||||
|       ENTRYPOINT_VERSION: v1 | ||||
| trigger: | ||||
|   branch: | ||||
|  | ||||
							
								
								
									
										43
									
								
								.env.sample
									
									
									
									
									
								
							
							
						
						
									
										43
									
								
								.env.sample
									
									
									
									
									
								
							| @ -1,6 +1,4 @@ | ||||
| TYPE=traefik | ||||
| TIMEOUT=300 | ||||
| ENABLE_AUTO_UPDATE=true | ||||
|  | ||||
| DOMAIN=traefik.example.com | ||||
| LETS_ENCRYPT_ENV=production | ||||
| @ -17,6 +15,9 @@ COMPOSE_FILE="compose.yml" | ||||
| # General settings                                                  # | ||||
| ##################################################################### | ||||
|  | ||||
| ## Error pages | ||||
| COMPOSE_FILE="$COMPOSE_FILE:compose.error-pages.yml" | ||||
|  | ||||
| ## Host-mode networking | ||||
| #COMPOSE_FILE="$COMPOSE_FILE:compose.host.yml" | ||||
|  | ||||
| @ -46,26 +47,8 @@ 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 | ||||
|  | ||||
| ##################################################################### | ||||
| # Manual wildcard certificate insertion                             # | ||||
| ##################################################################### | ||||
|  | ||||
| # Set wildcards = 1, and uncomment compose_file to enable. | ||||
| # Create your certs elsewhere and add them like: | ||||
| # abra app secrets insert {myapp.example.coop} ssl_cert v1 "$(cat /path/to/fullchain.pem)" | ||||
| # abra app secrets insert {myapp.example.coop} ssl_key v1 "$(cat /path/to/privkey.pem)" | ||||
| #WILDCARDS_ENABLED=1 | ||||
| #SECRET_WILDCARD_CERT_VERSION=v1 | ||||
| #SECRET_WILDCARD_KEY_VERSION=v1 | ||||
| #COMPOSE_FILE="$COMPOSE_FILE:compose.wildcard.yml" | ||||
|  | ||||
| ##################################################################### | ||||
| # Authentication                                                    # | ||||
| # Keycloak log-in                                                   # | ||||
| ##################################################################### | ||||
|  | ||||
| ## Enable Keycloak | ||||
| @ -75,27 +58,14 @@ COMPOSE_FILE="compose.yml" | ||||
| #KEYCLOAK_MIDDLEWARE_2_ENABLED=1 | ||||
| #KEYCLOAK_TFA_SERVICE_2=traefik-forward-auth_app | ||||
|  | ||||
| ## BASIC_AUTH | ||||
| ## Use httpasswd to generate the secret | ||||
| #COMPOSE_FILE="$COMPOSE_FILE:compose.basicauth.yml" | ||||
| #BASIC_AUTH=1 | ||||
| #SECRET_USERSFILE_VERSION=v1 | ||||
|  | ||||
| ##################################################################### | ||||
| # Prometheus metrics                                                # | ||||
| ##################################################################### | ||||
|  | ||||
| ## Enable prometheus metrics collection | ||||
| ## used used by the coop-cloud monitoring stack | ||||
| #COMPOSE_FILE="$COMPOSE_FILE:compose.metrics.yml" | ||||
| #METRICS_ENABLED=1 | ||||
|  | ||||
| ##################################################################### | ||||
| # File provider directory configuration                             # | ||||
| # (Route bare metal and non-docker services on the machine!)        # | ||||
| ##################################################################### | ||||
| #FILE_PROVIDER_DIRECTORY_ENABLED=1 | ||||
|  | ||||
| ##################################################################### | ||||
| # Additional services                                               # | ||||
| ##################################################################### | ||||
| @ -135,8 +105,3 @@ COMPOSE_FILE="compose.yml" | ||||
| ## Matrix | ||||
| #COMPOSE_FILE="$COMPOSE_FILE:compose.matrix.yml" | ||||
| #MATRIX_FEDERATION_ENABLED=1 | ||||
|  | ||||
| ## "Web alt", an alternative web port | ||||
| # NOTE(3wc): as of 2024-04-01 only the `icecast` recipe uses this | ||||
| #COMPOSE_FILE="$COMPOSE_FILE:compose.web-alt.yml" | ||||
| #WEB_ALT_ENABLED=1 | ||||
|  | ||||
							
								
								
									
										6
									
								
								abra.sh
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								abra.sh
									
									
									
									
									
								
							| @ -1,3 +1,3 @@ | ||||
| export TRAEFIK_YML_VERSION=v20 | ||||
| export FILE_PROVIDER_YML_VERSION=v10 | ||||
| export ENTRYPOINT_VERSION=v3 | ||||
| export TRAEFIK_YML_VERSION=v15 | ||||
| export FILE_PROVIDER_YML_VERSION=v6 | ||||
| export ENTRYPOINT_VERSION=v2 | ||||
|  | ||||
| @ -1,12 +0,0 @@ | ||||
| version: "3.8" | ||||
| services: | ||||
|   app: | ||||
|     environment: | ||||
|       - BASIC_AUTH | ||||
|     secrets: | ||||
|       - usersfile | ||||
|  | ||||
| secrets: | ||||
|   usersfile: | ||||
|     name: ${STACK_NAME}_usersfile_${SECRET_USERSFILE_VERSION} | ||||
|     external: true | ||||
| @ -1,15 +0,0 @@ | ||||
| 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 | ||||
							
								
								
									
										31
									
								
								compose.error-pages.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										31
									
								
								compose.error-pages.yml
									
									
									
									
									
										Normal 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" | ||||
|          | ||||
| @ -1,9 +0,0 @@ | ||||
| version: "3.8" | ||||
| services: | ||||
|   app: | ||||
|     environment: | ||||
|       - METRICS_ENABLED | ||||
|     ports: | ||||
|       - target: 8082 | ||||
|         published: 8082 | ||||
|         mode: host | ||||
| @ -1,7 +0,0 @@ | ||||
| version: "3.8" | ||||
| services: | ||||
|   app: | ||||
|     environment: | ||||
|       - WEB_ALT_ENABLED | ||||
|     ports: | ||||
|       - "8000:8000" | ||||
| @ -1,16 +0,0 @@ | ||||
| --- | ||||
| version: "3.8" | ||||
|  | ||||
| services: | ||||
|   app: | ||||
|     secrets: | ||||
|       - ssl_cert | ||||
|       - ssl_key | ||||
|  | ||||
| secrets: | ||||
|   ssl_cert: | ||||
|     name: ${STACK_NAME}_ssl_cert_${SECRET_WILDCARD_CERT_VERSION} | ||||
|     external: true | ||||
|   ssl_key: | ||||
|     name: ${STACK_NAME}_ssl_key_${SECRET_WILDCARD_KEY_VERSION} | ||||
|     external: true | ||||
| @ -3,7 +3,7 @@ version: "3.8" | ||||
|  | ||||
| services: | ||||
|   app: | ||||
|     image: "traefik:v2.11.1" | ||||
|     image: "traefik:v2.9.9" | ||||
|     # 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 | ||||
| @ -13,7 +13,6 @@ services: | ||||
|     volumes: | ||||
|       - "/var/run/docker.sock:/var/run/docker.sock" | ||||
|       - "letsencrypt:/etc/letsencrypt" | ||||
|       - "file-providers:/etc/traefik/file-providers" | ||||
|     configs: | ||||
|       - source: traefik_yml | ||||
|         target: /etc/traefik/traefik.yml | ||||
| @ -47,8 +46,7 @@ services: | ||||
|         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" | ||||
|         - "traefik.http.routers.${STACK_NAME}.service=api@internal" | ||||
|         - "traefik.http.routers.${STACK_NAME}.middlewares=security@file" | ||||
|         - "coop-cloud.${STACK_NAME}.version=2.6.2+v2.11.1" | ||||
|         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" | ||||
|         - "coop-cloud.${STACK_NAME}.version=2.1.0+v2.9.9" | ||||
|  | ||||
| networks: | ||||
|   proxy: | ||||
| @ -70,4 +68,3 @@ configs: | ||||
|  | ||||
| volumes: | ||||
|   letsencrypt: | ||||
|   file-providers: | ||||
|  | ||||
| @ -11,8 +11,4 @@ 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 "$@" | ||||
|  | ||||
| @ -17,14 +17,10 @@ http: | ||||
|         authResponseHeaders: | ||||
|           - X-Forwarded-User | ||||
|     {{ end }} | ||||
|     {{ if eq (env "BASIC_AUTH") "1" }} | ||||
|     basicauth: | ||||
|       basicAuth: | ||||
|         usersFile: "/run/secrets/usersfile" | ||||
|     {{ end }} | ||||
|     security: | ||||
|       headers: | ||||
|         frameDeny: true | ||||
|         sslRedirect: true | ||||
|         browserXssFilter: true | ||||
|         contentTypeNosniff: true | ||||
|         stsIncludeSubdomains: true | ||||
| @ -44,8 +40,3 @@ tls: | ||||
|         - CurveP521 | ||||
|         - CurveP384 | ||||
|       sniStrict: true | ||||
|   {{ if eq (env "WILDCARDS_ENABLED") "1" }} | ||||
|   certificates: | ||||
|     - certFile: /run/secrets/ssl_cert | ||||
|       keyFile: /run/secrets/ssl_key | ||||
|   {{ end }} | ||||
| @ -8,14 +8,8 @@ providers: | ||||
|     exposedByDefault: false | ||||
|     network: proxy | ||||
|     swarmMode: true | ||||
|   {{ if eq (env "FILE_PROVIDER_DIRECTORY_ENABLED") "1" }} | ||||
|   file: | ||||
|     directory: /etc/traefik/file-providers | ||||
|     watch: true | ||||
|   {{ else }} | ||||
|   file: | ||||
|     filename: /etc/traefik/file-provider.yml | ||||
|   {{ end }} | ||||
|  | ||||
| api: | ||||
|   dashboard: {{ env "DASHBOARD_ENABLED" }} | ||||
| @ -46,10 +40,6 @@ entrypoints: | ||||
|   peertube-rtmp: | ||||
|     address: ":1935" | ||||
|   {{ end }} | ||||
|   {{ if eq (env "WEB_ALT_ENABLED") "1" }} | ||||
|   web-alt: | ||||
|     address: ":8000" | ||||
|   {{ end }} | ||||
|   {{ if eq (env "SSB_MUXRPC_ENABLED") "1" }} | ||||
|   ssb-muxrpc: | ||||
|     address: ":8008" | ||||
| @ -71,9 +61,6 @@ entrypoints: | ||||
|   {{ if eq (env "METRICS_ENABLED") "1" }} | ||||
|   metrics: | ||||
|     address: ":8082" | ||||
|     http: | ||||
|       middlewares: | ||||
|         - basicauth@file | ||||
|   {{ end }} | ||||
|   {{ if eq (env "MATRIX_FEDERATION_ENABLED") "1" }} | ||||
|   matrix-federation: | ||||
| @ -87,8 +74,6 @@ ping: | ||||
| metrics: | ||||
|   prometheus: | ||||
|     entryPoint: metrics | ||||
|     addRoutersLabels: true | ||||
|     addServicesLabels: true | ||||
| {{ end }} | ||||
|  | ||||
| certificatesResolvers: | ||||
|  | ||||
		Reference in New Issue
	
	Block a user