4 Commits

11 changed files with 7 additions and 66 deletions

View File

@@ -12,6 +12,7 @@ services:
environment: environment:
HOMEPAGE_VAR_LOCAL_DOMAIN: ${LOCAL_DOMAIN} HOMEPAGE_VAR_LOCAL_DOMAIN: ${LOCAL_DOMAIN}
HOMEPAGE_VAR_PUBLIC_DOMAIN: ${PUBLIC_DOMAIN} HOMEPAGE_VAR_PUBLIC_DOMAIN: ${PUBLIC_DOMAIN}
HOMEPAGE_VAR_LOCAL_VPS_DOMAIN: ${VPS_DOMAIN}
HOMEPAGE_ALLOWED_HOSTS: homepage.${LOCAL_DOMAIN}, 192.168.178.35:3030 HOMEPAGE_ALLOWED_HOSTS: homepage.${LOCAL_DOMAIN}, 192.168.178.35:3030
volumes: volumes:
- ${INFRA_PATH}/homepage/config:/app/config - ${INFRA_PATH}/homepage/config:/app/config

View File

@@ -1,3 +0,0 @@
{
"/logs/traefik.log": 69278
}

View File

@@ -15,6 +15,7 @@ services:
environment: environment:
TRAEFIK_EMAIL: ${EMAIL} TRAEFIK_EMAIL: ${EMAIL}
TRAEFIK_LOCAL_DOMAIN: ${LOCAL_DOMAIN} TRAEFIK_LOCAL_DOMAIN: ${LOCAL_DOMAIN}
TRAEFIK_VPS_DOMAIN: ${VPS_DOMAIN}
TRAEFIK_PUBLIC_DOMAIN: ${PUBLIC_DOMAIN} TRAEFIK_PUBLIC_DOMAIN: ${PUBLIC_DOMAIN}
TRAEFIK_AUTH_PUBLIC_DOMAIN: auth.${PUBLIC_DOMAIN} TRAEFIK_AUTH_PUBLIC_DOMAIN: auth.${PUBLIC_DOMAIN}
TRAEFIK_CROWDSEC_API_KEY: ${CROWDSEC_API_KEY} TRAEFIK_CROWDSEC_API_KEY: ${CROWDSEC_API_KEY}
@@ -35,68 +36,6 @@ services:
- "traefik.http.routers.traefik.entrypoints=https" - "traefik.http.routers.traefik.entrypoints=https"
- "traefik.http.routers.traefik.tls=true" - "traefik.http.routers.traefik.tls=true"
traefik-agent:
extends:
file: ${TEMPLATES_PATH}
service: default
image: hhftechnology/traefik-log-dashboard-agent:2.4.1
container_name: traefik-log-dashboard-agent
networks:
- ip4net
ports:
- "8078:5000"
volumes:
- "/var/log/crowdsec/:/logs:ro"
- "${INFRA_PATH}/traefik/log-dashboard/positions:/data"
environment:
TRAEFIK_LOG_DASHBOARD_ACCESS_PATH: /logs/traefik.log
TRAEFIK_LOG_DASHBOARD_AUTH_TOKEN: ${TRAEFIK_DASHBOARD_TOKEN}
TRAEFIK_LOG_DASHBOARD_SYSTEM_MONITORING: true
TRAEFIK_LOG_DASHBOARD_LOG_FORMAT: json
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-log-dashboard
networks:
- ip4net
ports:
- "8077:3000"
volumes:
- ./data/dashboard:/app/data
- "${INFRA_PATH}/traefik/log-dashboard/dashboard:/app/data"
- "${INFRA_PATH}/traefik/log-dashboard/positions:/data"
environment:
AGENT_API_URL: http://192.168.178.35:8078
AGENT_API_TOKEN: ${TRAEFIK_DASHBOARD_TOKEN}
# Display Configuration
NEXT_PUBLIC_SHOW_DEMO_PAGE: false
depends_on:
traefik-agent:
condition: service_healthy
labels:
# traefik
- "traefik.enable=true"
- "traefik.http.routers.traefik-log-dashboard.rule=Host(`traefik-dashboard.${LOCAL_DOMAIN}`)"
- "traefik.http.routers.traefik-log-dashboard.entrypoints=https"
- "traefik.http.routers.traefik-log-dashboard.tls=true"
whoami: whoami:
extends: extends:
file: ${TEMPLATES_PATH} file: ${TEMPLATES_PATH}

View File

@@ -34,7 +34,7 @@ services:
extends: extends:
file: ${TEMPLATES_PATH} file: ${TEMPLATES_PATH}
service: default service: default
image: getmeili/meilisearch:v1.32.2 image: getmeili/meilisearch:v1.31.0
container_name: linkwarden_meili container_name: linkwarden_meili
networks: networks:
- ip4net - ip4net

View File

@@ -68,6 +68,10 @@
{ {
"matchPackageNames": "mrusse08/soularr", "matchPackageNames": "mrusse08/soularr",
"enabled": false "enabled": false
},
{
"matchPackageNames": "getmeili/meilisearch",
"enabled": false
} }
] ]
} }