forked from coop-cloud/traefik
		
	Compare commits
	
		
			31 Commits
		
	
	
		
			2.0.4+v2.9
			...
			error-page
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| c5fd144ff0 | |||
| 2db2f71a80 | |||
| c558e1dbdb | |||
| edc29f9594 | |||
| f7f77dc942 | |||
| ecc12b2b68 | |||
| a0e70f33be | |||
| e3c1df83fa | |||
| 998190f684 | |||
| cd92c909ba | |||
| 64351c27d1 | |||
| f4b05fd87f | |||
| 3c5333ba71 | |||
| 5f2fd0bf37 | |||
| ac3a47fe8c | |||
| 1e02f358ed | |||
| 6cdcc25384 | |||
| d2b7b671f5 | |||
| c9d80df34d | |||
| aaa34c1ea8 | |||
| 6dee438492 | |||
| ff668b2266 | |||
| e2c16be2ff | |||
| 892f3c3124 | |||
| 4205f4911e | |||
| 13eb4a782d | |||
| b00a65a890 | |||
| a213094d46 | |||
| 8bb3adba81 | |||
| a7bff09db6 | |||
| 6167d41588 | 
							
								
								
									
										35
									
								
								.env.sample
									
									
									
									
									
								
							
							
						
						
									
										35
									
								
								.env.sample
									
									
									
									
									
								
							| @ -1,4 +1,6 @@ | |||||||
| TYPE=traefik | TYPE=traefik | ||||||
|  | TIMEOUT=300 | ||||||
|  | ENABLE_AUTO_UPDATE=true | ||||||
|  |  | ||||||
| DOMAIN=traefik.example.com | DOMAIN=traefik.example.com | ||||||
| LETS_ENCRYPT_ENV=production | LETS_ENCRYPT_ENV=production | ||||||
| @ -45,7 +47,20 @@ COMPOSE_FILE="compose.yml" | |||||||
| #SECRET_GANDIV5_API_KEY_VERSION=v1 | #SECRET_GANDIV5_API_KEY_VERSION=v1 | ||||||
|  |  | ||||||
| ##################################################################### | ##################################################################### | ||||||
| # Keycloak log-in                                                   # | # 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                                                    # | ||||||
| ##################################################################### | ##################################################################### | ||||||
|  |  | ||||||
| ## Enable Keycloak | ## Enable Keycloak | ||||||
| @ -55,14 +70,27 @@ COMPOSE_FILE="compose.yml" | |||||||
| #KEYCLOAK_MIDDLEWARE_2_ENABLED=1 | #KEYCLOAK_MIDDLEWARE_2_ENABLED=1 | ||||||
| #KEYCLOAK_TFA_SERVICE_2=traefik-forward-auth_app | #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                                                # | # Prometheus metrics                                                # | ||||||
| ##################################################################### | ##################################################################### | ||||||
|  |  | ||||||
| ## Enable prometheus metrics collection | ## Enable prometheus metrics collection | ||||||
| ## used used by the coop-cloud monitoring stack | ## used used by the coop-cloud monitoring stack | ||||||
|  | #COMPOSE_FILE="$COMPOSE_FILE:compose.metrics.yml" | ||||||
| #METRICS_ENABLED=1 | #METRICS_ENABLED=1 | ||||||
|  |  | ||||||
|  | ##################################################################### | ||||||
|  | # File provider directory configuration                             # | ||||||
|  | # (Route bare metal and non-docker services on the machine!)        # | ||||||
|  | ##################################################################### | ||||||
|  | #FILE_PROVIDER_DIRECTORY_ENABLED=1 | ||||||
|  |  | ||||||
| ##################################################################### | ##################################################################### | ||||||
| # Additional services                                               # | # Additional services                                               # | ||||||
| ##################################################################### | ##################################################################### | ||||||
| @ -102,3 +130,8 @@ COMPOSE_FILE="compose.yml" | |||||||
| ## Matrix | ## Matrix | ||||||
| #COMPOSE_FILE="$COMPOSE_FILE:compose.matrix.yml" | #COMPOSE_FILE="$COMPOSE_FILE:compose.matrix.yml" | ||||||
| #MATRIX_FEDERATION_ENABLED=1 | #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 | ||||||
|  | |||||||
							
								
								
									
										21
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								README.md
									
									
									
									
									
								
							| @ -23,4 +23,25 @@ | |||||||
|    your Docker swarm box |    your Docker swarm box | ||||||
| 4. `abra app deploy YOURAPPDOMAIN` | 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 | ||||||
|  | |||||||
							
								
								
									
										4
									
								
								abra.sh
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								abra.sh
									
									
									
									
									
								
							| @ -1,3 +1,3 @@ | |||||||
| export TRAEFIK_YML_VERSION=v15 | export TRAEFIK_YML_VERSION=v20 | ||||||
| export FILE_PROVIDER_YML_VERSION=v6 | export FILE_PROVIDER_YML_VERSION=v10 | ||||||
| export ENTRYPOINT_VERSION=v2 | export ENTRYPOINT_VERSION=v2 | ||||||
|  | |||||||
							
								
								
									
										12
									
								
								compose.basicauth.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								compose.basicauth.yml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,12 @@ | |||||||
|  | version: "3.8" | ||||||
|  | services: | ||||||
|  |   app: | ||||||
|  |     environment: | ||||||
|  |       - BASIC_AUTH | ||||||
|  |     secrets: | ||||||
|  |       - usersfile | ||||||
|  |  | ||||||
|  | secrets: | ||||||
|  |   usersfile: | ||||||
|  |     name: ${STACK_NAME}_usersfile_${SECRET_USERSFILE_VERSION} | ||||||
|  |     external: true | ||||||
							
								
								
									
										29
									
								
								compose.errors.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										29
									
								
								compose.errors.yml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,29 @@ | |||||||
|  | --- | ||||||
|  | version: "3.8" | ||||||
|  |  | ||||||
|  | services: | ||||||
|  |   app: | ||||||
|  |     environment: | ||||||
|  |       - "CUSTOM_ERRORS=1" | ||||||
|  |     volumes: | ||||||
|  |       - "traefik-plugins:/plugins-local/" | ||||||
|  |   errors: | ||||||
|  |     image: "tarampampam/error-pages:2.27.0" | ||||||
|  |     networks: | ||||||
|  |       - proxy | ||||||
|  |     deploy: | ||||||
|  |       labels: | ||||||
|  |           - "traefik.enable=true" | ||||||
|  |           # use as "fallback" for any non-registered services (with priority below normal) | ||||||
|  |           - "traefik.http.routers.${STACK_NAME}-error.rule=HostRegexp(`{host:.+}`)" | ||||||
|  |           - "traefik.http.routers.${STACK_NAME}-error.priority=10" | ||||||
|  |           - "traefik.http.routers.${STACK_NAME}-error.entrypoints=web-secure" | ||||||
|  |           - "traefik.http.routers.${STACK_NAME}-error.tls.certresolver=${LETS_ENCRYPT_ENV}" | ||||||
|  |           - "traefik.http.services.${STACK_NAME}-error.loadbalancer.server.port=8080" | ||||||
|  |           # "errors" middleware settings | ||||||
|  |           - "traefik.http.middlewares.${STACK_NAME}-error.errors.status=400-599" | ||||||
|  |           - "traefik.http.middlewares.${STACK_NAME}-error.errors.service=${STACK_NAME}-error" | ||||||
|  |           - "traefik.http.middlewares.${STACK_NAME}-error.errors.query=/{status}.html" | ||||||
|  |  | ||||||
|  | volumes: | ||||||
|  |   traefik-plugins: | ||||||
							
								
								
									
										9
									
								
								compose.metrics.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								compose.metrics.yml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,9 @@ | |||||||
|  | version: "3.8" | ||||||
|  | services: | ||||||
|  |   app: | ||||||
|  |     environment: | ||||||
|  |       - METRICS_ENABLED | ||||||
|  |     ports: | ||||||
|  |       - target: 8082 | ||||||
|  |         published: 8082 | ||||||
|  |         mode: host | ||||||
							
								
								
									
										7
									
								
								compose.web-alt.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								compose.web-alt.yml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,7 @@ | |||||||
|  | version: "3.8" | ||||||
|  | services: | ||||||
|  |   app: | ||||||
|  |     environment: | ||||||
|  |       - WEB_ALT_ENABLED | ||||||
|  |     ports: | ||||||
|  |       - "8000:8000" | ||||||
							
								
								
									
										16
									
								
								compose.wildcard.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								compose.wildcard.yml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,16 @@ | |||||||
|  | --- | ||||||
|  | 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: | services: | ||||||
|   app: |   app: | ||||||
|     image: "traefik:v2.9.6" |     image: "traefik:v2.11.0" | ||||||
|     # 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 | ||||||
| @ -13,6 +13,7 @@ services: | |||||||
|     volumes: |     volumes: | ||||||
|       - "/var/run/docker.sock:/var/run/docker.sock" |       - "/var/run/docker.sock:/var/run/docker.sock" | ||||||
|       - "letsencrypt:/etc/letsencrypt" |       - "letsencrypt:/etc/letsencrypt" | ||||||
|  |       - "file-providers:/etc/traefik/file-providers" | ||||||
|     configs: |     configs: | ||||||
|       - source: traefik_yml |       - source: traefik_yml | ||||||
|         target: /etc/traefik/traefik.yml |         target: /etc/traefik/traefik.yml | ||||||
| @ -46,7 +47,8 @@ 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.0.4+v2.9.6" |         - "coop-cloud.${STACK_NAME}.version=2.6.0+v2.11.0" | ||||||
|  |         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" | ||||||
|  |  | ||||||
| networks: | networks: | ||||||
|   proxy: |   proxy: | ||||||
| @ -68,3 +70,4 @@ configs: | |||||||
|  |  | ||||||
| volumes: | volumes: | ||||||
|   letsencrypt: |   letsencrypt: | ||||||
|  |   file-providers: | ||||||
|  | |||||||
| @ -1,6 +1,19 @@ | |||||||
| --- | --- | ||||||
|  |  | ||||||
| http: | http: | ||||||
|   middlewares: |   middlewares: | ||||||
|  |     {{ if eq (env "CUSTOM_ERRORS") "1" }} | ||||||
|  |     error: | ||||||
|  |       plugin: | ||||||
|  |         traefik-error-page: | ||||||
|  |           debug: "true" | ||||||
|  |           contentsOnly: "false" | ||||||
|  |           contentsOnlyMatch: "Bad Gateway" | ||||||
|  |           query: /{status}.html | ||||||
|  |           service: http://{{ env "STACK_NAME" }}_errors:8080 | ||||||
|  |           status: | ||||||
|  |             - 502 | ||||||
|  |     {{ end }} | ||||||
|     {{ if eq (env "KEYCLOAK_MIDDLEWARE_ENABLED") "1" }} |     {{ if eq (env "KEYCLOAK_MIDDLEWARE_ENABLED") "1" }} | ||||||
|     keycloak: |     keycloak: | ||||||
|       forwardAuth: |       forwardAuth: | ||||||
| @ -17,10 +30,14 @@ http: | |||||||
|         authResponseHeaders: |         authResponseHeaders: | ||||||
|           - X-Forwarded-User |           - X-Forwarded-User | ||||||
|     {{ end }} |     {{ end }} | ||||||
|  |     {{ if eq (env "BASIC_AUTH") "1" }} | ||||||
|  |     basicauth: | ||||||
|  |       basicAuth: | ||||||
|  |         usersFile: "/run/secrets/usersfile" | ||||||
|  |     {{ end }} | ||||||
|     security: |     security: | ||||||
|       headers: |       headers: | ||||||
|         frameDeny: true |         frameDeny: true | ||||||
|         sslRedirect: true |  | ||||||
|         browserXssFilter: true |         browserXssFilter: true | ||||||
|         contentTypeNosniff: true |         contentTypeNosniff: true | ||||||
|         stsIncludeSubdomains: true |         stsIncludeSubdomains: true | ||||||
| @ -40,3 +57,8 @@ tls: | |||||||
|         - CurveP521 |         - CurveP521 | ||||||
|         - CurveP384 |         - CurveP384 | ||||||
|       sniStrict: true |       sniStrict: true | ||||||
|  |   {{ if eq (env "WILDCARDS_ENABLED") "1" }} | ||||||
|  |   certificates: | ||||||
|  |     - certFile: /run/secrets/ssl_cert | ||||||
|  |       keyFile: /run/secrets/ssl_key | ||||||
|  |   {{ end }} | ||||||
|  | |||||||
| @ -8,8 +8,14 @@ providers: | |||||||
|     exposedByDefault: false |     exposedByDefault: false | ||||||
|     network: proxy |     network: proxy | ||||||
|     swarmMode: true |     swarmMode: true | ||||||
|  |   {{ if eq (env "FILE_PROVIDER_DIRECTORY_ENABLED") "1" }} | ||||||
|  |   file: | ||||||
|  |     directory: /etc/traefik/file-providers | ||||||
|  |     watch: true | ||||||
|  |   {{ else }} | ||||||
|   file: |   file: | ||||||
|     filename: /etc/traefik/file-provider.yml |     filename: /etc/traefik/file-provider.yml | ||||||
|  |   {{ end }} | ||||||
|  |  | ||||||
| api: | api: | ||||||
|   dashboard: {{ env "DASHBOARD_ENABLED" }} |   dashboard: {{ env "DASHBOARD_ENABLED" }} | ||||||
| @ -18,10 +24,6 @@ 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" }} | ||||||
| @ -40,6 +42,10 @@ entrypoints: | |||||||
|   peertube-rtmp: |   peertube-rtmp: | ||||||
|     address: ":1935" |     address: ":1935" | ||||||
|   {{ end }} |   {{ end }} | ||||||
|  |   {{ if eq (env "WEB_ALT_ENABLED") "1" }} | ||||||
|  |   web-alt: | ||||||
|  |     address: ":8000" | ||||||
|  |   {{ end }} | ||||||
|   {{ if eq (env "SSB_MUXRPC_ENABLED") "1" }} |   {{ if eq (env "SSB_MUXRPC_ENABLED") "1" }} | ||||||
|   ssb-muxrpc: |   ssb-muxrpc: | ||||||
|     address: ":8008" |     address: ":8008" | ||||||
| @ -61,6 +67,9 @@ entrypoints: | |||||||
|   {{ if eq (env "METRICS_ENABLED") "1" }} |   {{ if eq (env "METRICS_ENABLED") "1" }} | ||||||
|   metrics: |   metrics: | ||||||
|     address: ":8082" |     address: ":8082" | ||||||
|  |     http: | ||||||
|  |       middlewares: | ||||||
|  |         - basicauth@file | ||||||
|   {{ end }} |   {{ end }} | ||||||
|   {{ if eq (env "MATRIX_FEDERATION_ENABLED") "1" }} |   {{ if eq (env "MATRIX_FEDERATION_ENABLED") "1" }} | ||||||
|   matrix-federation: |   matrix-federation: | ||||||
| @ -74,6 +83,8 @@ ping: | |||||||
| metrics: | metrics: | ||||||
|   prometheus: |   prometheus: | ||||||
|     entryPoint: metrics |     entryPoint: metrics | ||||||
|  |     addRoutersLabels: true | ||||||
|  |     addServicesLabels: true | ||||||
| {{ end }} | {{ end }} | ||||||
|  |  | ||||||
| certificatesResolvers: | certificatesResolvers: | ||||||
| @ -104,3 +115,10 @@ certificatesResolvers: | |||||||
|           - "1.1.1.1:53" |           - "1.1.1.1:53" | ||||||
|           - "9.9.9.9:53" |           - "9.9.9.9:53" | ||||||
|       {{ end }} |       {{ end }} | ||||||
|  |  | ||||||
|  | {{ if eq (env "CUSTOM_ERRORS") "1" }} | ||||||
|  | experimental: | ||||||
|  |   localplugins: | ||||||
|  |     traefik-error-page: | ||||||
|  |       moduleName: "github.com/3-w-c/traefik-error-page" | ||||||
|  | {{ end }} | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user
	