diff --git a/00-caddy/config/Caddyfile b/00-caddy/config/Caddyfile index 0637614..9829217 100644 --- a/00-caddy/config/Caddyfile +++ b/00-caddy/config/Caddyfile @@ -21,15 +21,18 @@ grafana.veltko.de { # Hosted on the home network, tunneled through tailscale jellyfin.veltko.de { - reverse_proxy http://192.168.0.109:30013 + reverse_proxy http://10.10.0.135:30013 { + } } fotos.veltko.de { - reverse_proxy http://192.168.0.109:30041 + reverse_proxy http://10.10.0.135:30041 { + } } git.veltko.de { - reverse_proxy http://192.168.0.109:30008 + reverse_proxy http://10.10.0.135:30008 { + } } vaultwarden.veltko.de { @@ -40,7 +43,7 @@ vaultwarden.veltko.de { } } - reverse_proxy https://192.168.0.109:30032 { + reverse_proxy https://10.10.0.135:30032 { transport http { #FIXME: this should really be replaced by a proper cert :( tls_insecure_skip_verify diff --git a/02-copyparty/config/copyparty.conf b/02-copyparty/config/copyparty.conf index 1574ec7..bbf4d8c 100644 --- a/02-copyparty/config/copyparty.conf +++ b/02-copyparty/config/copyparty.conf @@ -7,9 +7,11 @@ [accounts] weckyy702:fP4Nsk2EVSLmDXBnNj0dG0lMsb$GcvE0K2!ja#YKv$DsGdtM#1NQO272AVd&ZkSG + plexx:rEN5wlJc08CUKGOc02Os8f70+i7yAjYojEM6J60E5+Y= [/] /w accs: rwmda: weckyy702 + rw: plexx g: * diff --git a/04-prometheus/config/prometheus.yaml b/04-prometheus/config/prometheus.yaml index 2d97f75..ae42b73 100644 --- a/04-prometheus/config/prometheus.yaml +++ b/04-prometheus/config/prometheus.yaml @@ -13,3 +13,6 @@ scrape_configs: - job_name: host static_configs: - targets: ['host.docker.internal:9100'] + - job_name: cadvisor + static_configs: + - targets: ['cadvisor:8080'] diff --git a/06-cadvisor/docker-compose.yaml b/06-cadvisor/docker-compose.yaml new file mode 100644 index 0000000..1cc7da5 --- /dev/null +++ b/06-cadvisor/docker-compose.yaml @@ -0,0 +1,11 @@ +services: + cadvisor: + image: gcr.io/cadvisor/cadvisor:latest + container_name: cadvisor + networks: + nw-caddy: + volumes: + - /:/rootfs:ro + - /var/run:/var/run:rw + - /sys:/sys:ro + - /var/lib/docker/:/var/lib/docker:ro diff --git a/docker-compose.yaml b/docker-compose.yaml index 399c33d..e8a4009 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,6 +5,7 @@ include: - 03-grafana/docker-compose.yaml - 04-prometheus/docker-compose.yaml - 05-node_exporter/docker-compose.yaml + - 06-cadvisor/docker-compose.yaml networks: nw-caddy: