bump TRAEFIK_YML_VERSION

Add minecraft port
use domain env var
2022-09-27 16:42:18 -04:00 · 2022-05-07 00:10:13 +01:00 · 2022-03-27 21:12:16 +02:00 · 2022-03-26 23:49:10 +02:00 · 2022-01-06 11:12:47 +01:00 · 2022-01-06 10:06:04 +01:00
14 changed files with 97 additions and 21 deletions
@@ -1,6 +1,6 @@
 TYPE=traefik

-DOMAIN=traefik.example.com
+DOMAIN={{ .Domain }}
 LETS_ENCRYPT_ENV=production

 LETS_ENCRYPT_EMAIL=certs@example.com
@@ -8,8 +8,7 @@ LETS_ENCRYPT_EMAIL=certs@example.com
 # WARN, INFO etc.
 LOG_LEVEL=WARN

-# This is here so later lines can extend the definition; you likely don't wanna
-# edit
+# This is here so later lines can extend it; you likely don't wanna edit
 COMPOSE_FILE="compose.yml"

 #####################################################################
@@ -52,6 +51,17 @@ COMPOSE_FILE="compose.yml"
 ## Enable Keycloak
 #COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak.yml"
 #KEYCLOAK_MIDDLEWARE_ENABLED=1
+#KEYCLOAK_TFA_SERVICE=traefik-forward-auth_app
+#KEYCLOAK_MIDDLEWARE_2_ENABLED=1
+#KEYCLOAK_TFA_SERVICE_2=traefik-forward-auth_app
+
+#####################################################################
+# Prometheus metrics                                                #
+#####################################################################
+
+## Enable prometheus metrics collection
+## used used by the coop-cloud monitoring stack
+#METRICS_ENABLED=1

 #####################################################################
 # Additional services                                               #
@@ -61,6 +71,10 @@ COMPOSE_FILE="compose.yml"
 #COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
 #SMTP_ENABLED=1

+## Compy
+#COMPOSE_FILE="$COMPOSE_FILE:compose.compy.yml"
+#COMPY_ENABLED=1
+
 ## Gitea SSH
 # COMPOSE_FILE="$COMPOSE_FILE:compose.gitea.yml"
 # GITEA_SSH_ENABLED=1
@@ -84,3 +98,11 @@ COMPOSE_FILE="compose.yml"
 ## Mumble
 #COMPOSE_FILE="$COMPOSE_FILE:compose.mumble.yml"
 #MUMBLE_ENABLED=1
+
+## Matrix
+#COMPOSE_FILE="$COMPOSE_FILE:compose.matrix.yml"
+#MATRIX_FEDERATION_ENABLED=1
+
+## Minecraft
+#COMPOSE_FILE="$COMPOSE_FILE:compose.minecraft.yml"
+#MINECRAFT_ENABLED=1
@@ -7,11 +7,11 @@
 <!-- metadata -->
 * **Category**: Utilities
 * **Status**: ?
-* **Image**: [`traefik`](https://hub.docker.com/_/traefik), ❶💚, upstream
+* **Image**: [`traefik`](https://hub.docker.com/_/traefik), 4, upstream
 * **Healthcheck**: Yes
 * **Backups**: No
 * **Email**: N/A
-* **Tests**: ❷💛
+* **Tests**: 2
 * **SSO**: ? (Keycloak)
 <!-- endmetadata -->

@@ -1,3 +1,3 @@
-export TRAEFIK_YML_VERSION=v11
-export FILE_PROVIDER_YML_VERSION=v2
+export TRAEFIK_YML_VERSION=v16
+export FILE_PROVIDER_YML_VERSION=v6
 export ENTRYPOINT_VERSION=v2
@@ -0,0 +1,7 @@
+version: "3.8"
+services:
+  app:
+    environment:
+      - COMPY_ENABLED
+    ports:
+      - "9999:9999"
@@ -12,4 +12,3 @@ services:
        - "traefik.http.services.traefik.loadbalancer.server.port=web"
        - "traefik.http.routers.traefik.entrypoints=web-secure"
        - "traefik.http.routers.traefik.service=api@internal"
-        - "coop-cloud.${STACK_NAME}.app.version=v2.4.9-be23e1f6"
@@ -13,6 +13,3 @@ services:
      - target: 443
        published: 443
        mode: host
-      - target: 2222
-        published: 2222
-        mode: host
@@ -5,6 +5,9 @@ services:
  app:
    deploy:
      labels:
-        - "traefik.http.routers.traefik.middlewares=keycloak@file"
+        - "traefik.http.routers.${STACK_NAME}.middlewares=keycloak@file"
    environment:
      - KEYCLOAK_MIDDLEWARE_ENABLED
+      - KEYCLOAK_TFA_SERVICE
+      - KEYCLOAK_MIDDLEWARE_2_ENABLED
+      - KEYCLOAK_TFA_SERVICE_2
@@ -0,0 +1,7 @@
+version: "3.8"
+services:
+  app:
+    environment:
+      - MATRIX_FEDERATION_ENABLED
+    ports:
+      - "8448:8448"
@@ -0,0 +1,7 @@
+version: "3.8"
+services:
+  app:
+    environment:
+      - MINECRAFT_ENABLED
+    ports:
+      - 25565:25565
@@ -0,0 +1,9 @@
+---
+version: "3.8"
+
+services:
+  app:
+    environment:
+      - MINIO_CONSOLE_ENABLED
+    ports:
+      - "9001:9001"
@@ -1,7 +1,9 @@
+---
 version: "3.8"
+
 services:
  app:
-    image: "traefik:v2.4.11"
+    image: "traefik:v2.5.6"
    # 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
@@ -45,10 +47,12 @@ services:
        - "traefik.http.routers.traefik.tls.options=default@file"
        - "traefik.http.routers.traefik.service=api@internal"
        - "traefik.http.routers.traefik.middlewares=security@file"
-        - "coop-cloud.${STACK_NAME}.app.version=v2.4.9-be23e1f6"
+        - "coop-cloud.${STACK_NAME}.version=1.0.1+v2.5.6"
+
 networks:
  proxy:
    external: true
+
 configs:
  traefik_yml:
    name: ${STACK_NAME}_traefik_yml_${TRAEFIK_YML_VERSION}
@@ -62,5 +66,6 @@ configs:
    name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
    file: entrypoint.sh.tmpl
    template_driver: golang
+
 volumes:
  letsencrypt:
@@ -4,7 +4,15 @@ http:
    {{ if eq (env "KEYCLOAK_MIDDLEWARE_ENABLED") "1" }}
    keycloak:
      forwardAuth:
-        address: "http://traefik-forward-auth:4181"
+        address: "http://{{ env "KEYCLOAK_TFA_SERVICE" }}:4181"
+        trustForwardHeader: true
+        authResponseHeaders:
+          - X-Forwarded-User
+    {{ end }}
+    {{ if eq (env "KEYCLOAK_MIDDLEWARE_2_ENABLED") "1" }}
+    keycloak2:
+      forwardAuth:
+        address: "http://{{ env "KEYCLOAK_TFA_SERVICE_2" }}:4181"
        trustForwardHeader: true
        authResponseHeaders:
          - X-Forwarded-User
@@ -1,6 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base"
-  ]
-}
@@ -54,10 +54,28 @@ entrypoints:
  mumble-udp:
    address: ":64738/udp"
  {{ end }}
+  {{ if eq (env "MINECRAFT_ENABLED") "1" }}
+  minecraft:
+    address: ":25565"
+  {{ end }}
+  {{ if eq (env "METRICS_ENABLED") "1" }}
+  metrics:
+    address: ":8082"
+  {{ end }}
+  {{ if eq (env "MATRIX_FEDERATION_ENABLED") "1" }}
+  matrix-federation:
+    address: ":9001"
+  {{ end }}

 ping:
  entryPoint: web

+{{ if eq (env "METRICS_ENABLED") "1" }}
+metrics:
+  prometheus:
+    entryPoint: metrics
+{{ end }}
+
 certificatesResolvers:
  staging:
    acme:
Author	SHA1	Message	Date
3wordchant	8789bec57c	bump TRAEFIK_YML_VERSION	2022-09-27 16:42:18 -04:00
3wordchant	dd65184308	Add minecraft port	2022-05-07 00:10:13 +01:00
decentral1se	df49a1f3b2	use domain env var	2022-03-27 21:12:16 +02:00
3wordchant	099dcfaed0	Add compy support	2022-03-26 23:49:10 +02:00
decentral1se	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
decentral1se	5e1604322e	fix: bump vendored config	2022-01-06 10:06:04 +01:00
decentral1se	36707989d2	fix: add missing entrypoints (matrix, minio)	2022-01-06 10:01:52 +01:00
decentral1se	29f90fe409	feat: minio port	2022-01-06 09:50:35 +01:00
decentral1se	8a48c5e507	chore: publish 1.0.1+v2.5.6 release	2021-12-28 03:38:36 +01:00
decentral1se	612d0cc6cc	feat: matrix federation	2021-12-13 13:56:36 +01:00
3wordchant	36c7b740ab	Merge pull request 'Add a slot for a second traefik-forward-auth' (#31 ) from forward-auth-2 into master Reviewed-on: coop-cloud/traefik#31	2021-11-24 15:10:53 +00:00
3wordchant	59b0f8d645	Make sure variable names align, fix template	2021-11-23 12:40:17 +02:00
3wordchant	556c448c05	Align traefik-forward-auth 2nd var name with existing	2021-11-23 12:40:17 +02:00
3wordchant	26fcaaea69	Add a slot for a second traefik-forward-auth instance	2021-11-23 12:40:17 +02:00
3wordchant	02ebb1412f	Goodbye, emojis! 😢 [ci skip]	2021-11-23 12:23:23 +02:00
3wordchant	8e91a5a3ee	Minuscule .env tweak	2021-10-14 00:44:40 +02:00
d1admin	3048d09cd8	fix: support configurable tfa service	2021-10-14 00:43:56 +02:00
d1admin	2c9e980809	chore: remove old file	2021-10-12 11:41:56 +02:00
d1admin	ec47f5c9dd	chore: first release	2021-10-12 11:41:53 +02:00
d1admin	cf81dc543a	chore: upgrade to 2.5.2 and add spaces	2021-09-15 13:35:57 +02:00
d1admin	48f03d8fcf	Remove 2222 port from host networking This was an old config for when we did host mode networking for gitea ssh but now we use the SNI thing that seems to work.	2021-09-02 09:15:58 +02:00
decentral1se	8c6fe61e60	Merge pull request 'Allow prometheus metrics collection' (#28 ) from mirsal/traefik:prometheus-metrics into master Reviewed-on: coop-cloud/traefik#28	2021-08-10 06:19:46 +00:00
mirsal	fc5aa70d27	Allow prometheus metrics collection This patch adds a METRICS_ENABLED configuration variables which, when switched on, defines a metrics entrypoint and enables the built-in prometheus metrics exporter. This allows the monitoring stack to collect and show traefik metrics	2021-08-09 23:28:15 +00:00
3wordchant	9e123afb07	Merge pull request 'COMPOSE_FILE=$COMPOSE_FILE:`, to combine 'em easier' (#27 ) from rejig-compose-vars into master Reviewed-on: coop-cloud/traefik#27	2021-08-07 17:55:05 +00:00