trails-cool/trails
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #91 from trails-cool/fix-caddy-env

Browse source 
Fix Caddy env vars and Loki compactor config
This commit is contained in:
Ullrich Schäfer 2026-03-27 13:55:49 +01:00 • committed by GitHub
commit 4751176da9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/cd.yml vendored
View file

@ -79,7 +79,7 @@ jobs:
host: ${{ secrets.DEPLOY_HOST }} host: ${{ secrets.DEPLOY_HOST }}
username: root username: root
key: ${{ secrets.DEPLOY_SSH_KEY }} key: ${{ secrets.DEPLOY_SSH_KEY }}
source: "infrastructure/docker-compose.yml,infrastructure/Caddyfile" source: "infrastructure/docker-compose.yml,infrastructure/Caddyfile,infrastructure/prometheus/prometheus.yml,infrastructure/loki/loki-config.yml,infrastructure/grafana/provisioning,infrastructure/grafana/dashboards"
target: /opt/trails-cool target: /opt/trails-cool
strip_components: 1 strip_components: 1

4
infrastructure/docker-compose.yml
View file

@ -6,6 +6,10 @@ services:
- "80:80" - "80:80"
- "443:443" - "443:443"
- "443:443/udp" - "443:443/udp"
environment:
DOMAIN: ${DOMAIN:-trails.cool}
GRAFANA_USER: ${GRAFANA_USER:-admin}
GRAFANA_PASSWORD_HASH: ${GRAFANA_PASSWORD_HASH:-}
volumes: volumes:
- ./Caddyfile:/etc/caddy/Caddyfile:ro - ./Caddyfile:/etc/caddy/Caddyfile:ro
- caddy_data:/data - caddy_data:/data

1
infrastructure/loki/loki-config.yml
View file

@ -30,3 +30,4 @@ limits_config:
compactor: compactor:
working_directory: /loki/compactor working_directory: /loki/compactor
retention_enabled: true retention_enabled: true
delete_request_store: filesystem