chore: first release

chore: upgrade to 2.5.2 and add spaces
Remove 2222 port from host networking
2021-10-12 11:41:53 +02:00 · 2021-09-15 13:35:57 +02:00 · 2021-09-02 09:15:58 +02:00 · 2021-08-10 06:19:46 +00:00 · 2021-08-09 23:28:15 +00:00 · 2021-08-07 17:55:05 +00:00
5 changed files with 26 additions and 6 deletions
--- a/.env.sample
+++ b/.env.sample
@ -53,6 +53,14 @@ COMPOSE_FILE="compose.yml"
 #COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak.yml"
 #KEYCLOAK_MIDDLEWARE_ENABLED=1

+#####################################################################
+# Prometheus metrics                                                #
+#####################################################################
+
+## Enable prometheus metrics collection
+## used used by the coop-cloud monitoring stack
+#METRICS_ENABLED=1
+
 #####################################################################
 # Additional services                                               #
 #####################################################################
--- a/abra.sh
+++ b/abra.sh
@ -1,3 +1,3 @@
-export TRAEFIK_YML_VERSION=v11
+export TRAEFIK_YML_VERSION=v12
 export FILE_PROVIDER_YML_VERSION=v2
 export ENTRYPOINT_VERSION=v2
--- a/compose.host.yml
+++ b/compose.host.yml
@ -13,6 +13,3 @@ services:
      - target: 443
        published: 443
        mode: host
-      - target: 2222
-        published: 2222
-        mode: host
--- a/compose.yml
+++ b/compose.yml
@ -1,7 +1,9 @@
+---
 version: "3.8"
+
 services:
  app:
-    image: "traefik:v2.4.11"
+    image: "traefik:v2.5.2"
    # 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.0+v2.5.2"
+
 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:
--- a/traefik.yml.tmpl
+++ b/traefik.yml.tmpl
@ -54,10 +54,20 @@ entrypoints:
  mumble-udp:
    address: ":64738/udp"
  {{ end }}
+  {{ if eq (env "METRICS_ENABLED") "1" }}
+  metrics:
+    address: ":8082"
+  {{ end }}

 ping:
  entryPoint: web

+{{ if eq (env "METRICS_ENABLED") "1" }}
+metrics:
+  prometheus:
+    entryPoint: metrics
+{{ end }}
+
 certificatesResolvers:
  staging:
    acme:
Author	SHA1	Message	Date
decentral1se	ec47f5c9dd	chore: first release	2021-10-12 11:41:53 +02:00
decentral1se	cf81dc543a	chore: upgrade to 2.5.2 and add spaces	2021-09-15 13:35:57 +02:00
decentral1se	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