:Merge branch 'main' of https://gitea.crescentec.ch/chriswin/vps-server

services/crowdsec/config.yaml

@@ -47,5 +47,5 @@ api:
 prometheus:
   enabled: true
   level: full
-  listen_addr: "[::]"
+  listen_addr: "100.64.0.3"
   listen_port: 6060

services/traefik/traefik.yml

@@ -37,73 +37,74 @@ services:
       - "traefik.http.routers.traefik.entrypoints=https"
       - "traefik.http.routers.traefik.tls=true"
 
-  traefik-agent:
-    extends:
-      file: ${TEMPLATES_PATH}
-      service: default
-    image: hhftechnology/traefik-log-dashboard-agent:3.1.0
-    container_name: traefik-log-dashboard-agent
-    networks:
-      - ip4net
-    ports:
-      - "8078:5000"
-    volumes:
-      - "/var/log/traefik/:/logs:ro"
-      - "${SERVICE_PATH}/traefik/log-dashboard/positions:/data"
-    environment:
-      TRAEFIK_LOG_DASHBOARD_ACCESS_PATH: /logs/access.log
-      TRAEFIK_LOG_DASHBOARD_AUTH_TOKEN: ${TRAEFIK_DASHBOARD_TOKEN}
-      TRAEFIK_LOG_DASHBOARD_SYSTEM_MONITORING: true
-      TRAEFIK_LOG_DASHBOARD_LOG_FORMAT: json
-    deploy:
-      resources:
-        limits:
-          cpus: "0.10"
-          memory: 50M
-    healthcheck:
-      test:
-        [
-          "CMD",
-          "wget",
-          "--no-verbose",
-          "--tries=1",
-          "--spider",
-          "http://localhost:5000/api/logs/status",
-        ]
-      interval: 2m
-      timeout: 10s
-      retries: 3
-      start_period: 30s
-
-  traefik-dashboard:
-    extends:
-      file: ${TEMPLATES_PATH}
-      service: default
-    image: hhftechnology/traefik-log-dashboard:3.0.0
-    container_name: traefik-log-dashboard
-    networks:
-      - ip4net
-    ports:
-      - "8077:3000"
-    volumes:
-      - "${SERVICE_PATH}/traefik/log-dashboard/dashboard:/app/data"
-      - "${SERVICE_PATH}/traefik/log-dashboard/positions:/data"
-    environment:
-      AGENT_API_URL: http://traefik-agent:5000
-      AGENT_API_TOKEN: ${TRAEFIK_DASHBOARD_TOKEN}
-      # Display Configuration
-      NEXT_PUBLIC_SHOW_DEMO_PAGE: false
-    depends_on:
-      traefik-agent:
-        condition: service_healthy
-    deploy:
-      resources:
-        limits:
-          cpus: "0.1"
-          memory: 50M
-    labels:
-      # traefik
-      - "traefik.enable=true"
-      - "traefik.http.routers.traefik-log-dashboard.rule=Host(`traefik-dashboard.${LOCAL_VPS_DOMAIN}`)"
-      - "traefik.http.routers.traefik-log-dashboard.entrypoints=https"
-      - "traefik.http.routers.traefik-log-dashboard.tls=true"
+<<<<<<< HEAD
+  # traefik-agent:
+  #   extends:
+  #     file: ${TEMPLATES_PATH}
+  #     service: default
+  #   image: hhftechnology/traefik-log-dashboard-agent:2.4.1
+  #   container_name: traefik-agent
+  #   networks:
+  #     - ip4net
+  #   ports:
+  #     - "8078:5000"
+  #   volumes:
+  #     - "/var/log/traefik/:/logs:ro"
+  #     - "${SERVICE_PATH}/traefik/log-dashboard/positions:/data"
+  #   environment:
+  #     TRAEFIK_LOG_DASHBOARD_ACCESS_PATH: /logs/access.log
+  #     TRAEFIK_LOG_DASHBOARD_AUTH_TOKEN: ${TRAEFIK_DASHBOARD_TOKEN}
+  #     TRAEFIK_LOG_DASHBOARD_SYSTEM_MONITORING: true
+  #     TRAEFIK_LOG_DASHBOARD_LOG_FORMAT: json
+  #   deploy:
+  #     resources:
+  #       limits:
+  #         cpus: "0.15"
+  #         memory: 50M
+  #   healthcheck:
+  #     test:
+  #       [
+  #         "CMD",
+  #         "wget",
+  #         "--no-verbose",
+  #         "--tries=1",
+  #         "--spider",
+  #         "http://localhost:5000/api/logs/status",
+  #       ]
+  #     interval: 2m
+  #     timeout: 10s
+  #     retries: 3
+  #     start_period: 30s
+  #
+  # traefik-dashboard:
+  #   extends:
+  #     file: ${TEMPLATES_PATH}
+  #     service: default
+  #   image: hhftechnology/traefik-log-dashboard:2.4.1
+  #   container_name: traefik-dashboard
+  #   networks:
+  #     - ip4net
+  #   ports:
+  #     - "8077:3000"
+  #   volumes:
+  #     - "${SERVICE_PATH}/traefik/log-dashboard/dashboard:/app/data"
+  #     - "${SERVICE_PATH}/traefik/log-dashboard/positions:/data"
+  #   environment:
+  #     AGENT_API_URL: http://traefik-agent:5000
+  #     AGENT_API_TOKEN: ${TRAEFIK_DASHBOARD_TOKEN}
+  #     # Display Configuration
+  #     NEXT_PUBLIC_SHOW_DEMO_PAGE: false
+  #   depends_on:
+  #     traefik-agent:
+  #       condition: service_healthy
+  #   deploy:
+  #     resources:
+  #       limits:
+  #         cpus: "0.1"
+  #         memory: 120M
+  #   labels:
+  #     # traefik
+  #     - "traefik.enable=true"
+  #     - "traefik.http.routers.traefik-log-dashboard.rule=Host(`traefik-dashboard.${LOCAL_VPS_DOMAIN}`)"
+  #     - "traefik.http.routers.traefik-log-dashboard.entrypoints=https"
+  #     - "traefik.http.routers.traefik-log-dashboard.tls=true"