From e1109e31a4a93c673ed2f2c5689d2db36fd3dcf7 Mon Sep 17 00:00:00 2001
From: decentral1se <cellarspoon@riseup.net>
Date: Fri, 18 Mar 2022 10:36:58 +0100
Subject: [PATCH] formatting pass on node_exporter conf

---
 compose.yml                 | 18 +++++++++---------
 node-exporter-entrypoint.sh |  2 ++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/compose.yml b/compose.yml
index 9580851..d604f75 100644
--- a/compose.yml
+++ b/compose.yml
@@ -23,19 +23,19 @@ services:
       - source: node_exporter_entrypoint_sh
         target: /entrypoint.sh
     networks:
-      - proxy 
+      - proxy
+    entrypoint: "/bin/sh", "-e", "/entrypoint.sh"]
     deploy:
       labels:
-          - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=9100"
-          - "traefik.http.routers.${STACK_NAME}.rule=Host(`${NODE_EXPORTER_DOMAIN}`)"
-          - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
-          - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
           - "traefik.enable=true"
-          - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
-          - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
-          - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
+          - "traefik.http.services.${STACK_NAME}-nodexp.loadbalancer.server.port=9100"
+          - "traefik.http.routers.${STACK_NAME}-nodexp.rule=Host(`${NODE_EXPORTER_DOMAIN}`)"
+          - "traefik.http.routers.${STACK_NAME}-nodexp.entrypoints=web-secure"
+          - "traefik.http.routers.${STACK_NAME}-nodexp.tls.certresolver=${LETS_ENCRYPT_ENV}"
+          - "traefik.http.routers.${STACK_NAME}-nodexp.middlewares=${STACK_NAME}-redirect"
+          - "traefik.http.middlewares.${STACK_NAME}-nodexp-redirect.headers.SSLForceHost=true"
+          - "traefik.http.middlewares.${STACK_NAME}-nodexp-redirect.headers.SSLHost=${DOMAIN}"
           - "coop-cloud.${STACK_NAME}.version=0.0.1+v1.0.1"
-    entrypoint: ["/bin/sh", "-e", "/entrypoint.sh"]
 
         #  cadvisor:
         #    image: google/cadvisor:latest
diff --git a/node-exporter-entrypoint.sh b/node-exporter-entrypoint.sh
index 72e2f0b..286098d 100644
--- a/node-exporter-entrypoint.sh
+++ b/node-exporter-entrypoint.sh
@@ -1,7 +1,9 @@
 #!/bin/sh -e
 
 NODE_NAME=$(cat /etc/nodename)
+
 mkdir -p /etc/node-exporter
+
 echo "node_meta{node_id=\"$NODE_ID\", container_label_com_docker_swarm_node_id=\"$NODE_ID\", node_name=\"$NODE_NAME\"} 1" > /etc/node-exporter/node-meta.prom
 
 set -- /bin/node_exporter "$@"