diff --git a/adguardhome/compose.yaml b/adguardhome/compose.yaml index 290f600..eafd5d5 100644 --- a/adguardhome/compose.yaml +++ b/adguardhome/compose.yaml @@ -17,7 +17,7 @@ services: labels: - "traefik.enable=true" - "traefik.http.services.adguard.loadbalancer.server.port=3000" - + # Prod Router - "traefik.http.routers.adguard.rule=Host(`dns.forust.xyz`) || Host(`adguard.forust.xyz`)" - "traefik.http.routers.adguard.entrypoints=websecure" @@ -34,7 +34,7 @@ services: - "traefik.http.routers.dns-over-https.rule=(Host(`dns.forust.xyz` || Host(`adguard.forust.xyz`)) && PathPrefix(`/dns-query`))" - "traefik.http.routers.dns-over-https.entrypoints=websecure" - "traefik.http.routers.dns-over-https.tls.certresolver=letsencrypt" - + # Glance Metadata - glance.name=adguard - glance.url=https://adguard.forust.xyz/ diff --git a/converters/compose.yaml b/converters/compose.yaml index 30e6fff..68da044 100644 --- a/converters/compose.yaml +++ b/converters/compose.yaml @@ -39,15 +39,15 @@ services: - proxy volumes: - data:/app/data - + bentopdf: container_name: bentopdf image: bentopdf/bentopdf:latest restart: unless-stopped - labels: + labels: - "traefik.enable=true" - "traefik.http.services.bentopdf.loadbalancer.server.port=8080" - + # Prod router - "traefik.http.routers.bentopdf.rule=Host(`pdf.forust.xyz`)" - "traefik.http.routers.bentopdf.entrypoints=websecure" @@ -57,7 +57,7 @@ services: - "traefik.http.routers.bentopdf-local.rule=Host(`pdf.wokstation.internal`)" - "traefik.http.routers.bentopdf-local.entrypoints=websecure" - "traefik.http.routers.bentopdf-local.tls=true" - # Prod router + # Dev router - "traefik.http.routers.bentopdf-dev.rule=Host(`pdf.gigaforust.internal`)" - "traefik.http.routers.bentopdf-dev.entrypoints=websecure" - "traefik.http.routers.bentopdf-dev.tls=true" @@ -67,4 +67,4 @@ networks: proxy: external: true volumes: - data: \ No newline at end of file + data: diff --git a/dockmon/compose.yaml b/dockmon/compose.yaml index 5587566..9863b0a 100644 --- a/dockmon/compose.yaml +++ b/dockmon/compose.yaml @@ -1,46 +1,46 @@ services: - dockmon: - image: darthnorse/dockmon:latest - container_name: dockmon - restart: unless-stopped - # ports: - # - 8000:443 - volumes: - - data:/app/data - - /var/run/docker.sock:/var/run/docker.sock - healthcheck: - test: [ "CMD", "curl", "-k", "-f", "https://localhost:443/health" ] - interval: 30s - timeout: 10s - retries: 3 - labels: - - "traefik.enable=true" - - "traefik.http.services.dockmon.loadbalancer.server.port=443" - - "traefik.http.services.dockmon.loadbalancer.server.scheme=https" - - "traefik.http.services.dockmon.loadbalancer.serverstransport=insecureTransport@file" + dockmon: + image: darthnorse/dockmon:latest + container_name: dockmon + restart: unless-stopped + # ports: + # - 8000:443 + volumes: + - data:/app/data + - /var/run/docker.sock:/var/run/docker.sock + healthcheck: + test: ["CMD", "curl", "-k", "-f", "https://localhost:443/health"] + interval: 30s + timeout: 10s + retries: 3 + labels: + - "traefik.enable=true" + - "traefik.http.services.dockmon.loadbalancer.server.port=443" + - "traefik.http.services.dockmon.loadbalancer.server.scheme=https" + - "traefik.http.services.dockmon.loadbalancer.serverstransport=insecureTransport@file" - # Prod Router - - "traefik.http.routers.dockmon.rule=Host(`dockmon.forust.xyz`)" - - "traefik.http.routers.dockmon.entrypoints=websecure" - - "traefik.http.routers.dockmon.middlewares=security-headers@file" - - "traefik.http.routers.dockmon.tls.certresolver=letsencrypt" - # Local Router - - "traefik.http.routers.dockmon-local.rule=Host(`dockmon.workstation.internal`)" - - "traefik.http.routers.dockmon-local.entrypoints=websecure" - - "traefik.http.routers.dockmon-local.tls=true" - # Dev Router - - "traefik.http.routers.dockmon-dev.rule=Host(`dockmon.gigaforust.internal`)" - - "traefik.http.routers.dockmon-dev.entrypoints=websecure" - - "traefik.http.routers.dockmon-dev.tls=true" + # Prod Router + - "traefik.http.routers.dockmon.rule=Host(`dockmon.forust.xyz`)" + - "traefik.http.routers.dockmon.entrypoints=websecure" + - "traefik.http.routers.dockmon.middlewares=security-headers@file" + - "traefik.http.routers.dockmon.tls.certresolver=letsencrypt" + # Local Router + - "traefik.http.routers.dockmon-local.rule=Host(`dockmon.workstation.internal`)" + - "traefik.http.routers.dockmon-local.entrypoints=websecure" + - "traefik.http.routers.dockmon-local.tls=true" + # Dev Router + - "traefik.http.routers.dockmon-dev.rule=Host(`dockmon.gigaforust.internal`)" + - "traefik.http.routers.dockmon-dev.entrypoints=websecure" + - "traefik.http.routers.dockmon-dev.tls=true" - # Glance Metadata - - glance.name=dockmon - - glance.url=https://dockmon.forust.xyz/ - - glance.description=Dockmon is a lightweight Docker container monitoring and management tool with a user-friendly web interface. - networks: - - proxy + # Glance Metadata + - glance.name=dockmon + - glance.url=https://dockmon.forust.xyz/ + - glance.description=Dockmon is a lightweight Docker container monitoring and management tool with a user-friendly web interface. + networks: + - proxy volumes: - data: + data: networks: - proxy: - external: true + proxy: + external: true diff --git a/downtify/compose.yaml b/downtify/compose.yaml index 3394421..645ec3c 100644 --- a/downtify/compose.yaml +++ b/downtify/compose.yaml @@ -11,7 +11,7 @@ services: - "traefik.enable=true" - "traefik.http.services.downtify.loadbalancer.server.port=8000" - # Prod Router + # Prod Router - "traefik.http.routers.downtify.rule=Host(`downtify.forust.xyz`)" - "traefik.http.routers.downtify.entrypoints=websecure" - "traefik.http.routers.downtify.middlewares=security-chain@file" diff --git a/gitea/compose.yaml b/gitea/compose.yaml index 2cb53cd..cf327e0 100644 --- a/gitea/compose.yaml +++ b/gitea/compose.yaml @@ -12,7 +12,7 @@ services: - GITEA__database__USER=gitea - GITEA__database__PASSWD=gitea - GITEA__database__NAME=gitea - #Server + # Server - GITEA__server__ROOT_URL=https://gitea.forust.xyz - GITEA__server__SSH_DOMAIN=gitssh.forust.xyz - GITEA__server__SSH_PORT=2221 diff --git a/glance/compose.yaml b/glance/compose.yaml index 2027087..cfc66c5 100644 --- a/glance/compose.yaml +++ b/glance/compose.yaml @@ -33,4 +33,4 @@ services: - proxy networks: proxy: - external: true \ No newline at end of file + external: true diff --git a/glance/config/home.yml b/glance/config/home.yml index c81bcf9..b3a8510 100644 --- a/glance/config/home.yml +++ b/glance/config/home.yml @@ -64,7 +64,7 @@ name: Apple - symbol: MSFT name: Microsoft - + - type: releases cache: 1d diff --git a/glance/config/monitor.yml b/glance/config/monitor.yml index 075c366..f03bc92 100644 --- a/glance/config/monitor.yml +++ b/glance/config/monitor.yml @@ -1,15 +1,13 @@ - name: Monitoring columns: - - size: small - widgets: - - type: dns-stats - service: adguard - url: http://adguardhome:3000 - username: forust - password: ${ADGUARD_PASSWORD} - - size: full - widgets: - - type: docker-containers - hide-by-default: false - - \ No newline at end of file + - size: small + widgets: + - type: dns-stats + service: adguard + url: http://adguardhome:3000 + username: forust + password: ${ADGUARD_PASSWORD} + - size: full + widgets: + - type: docker-containers + hide-by-default: false diff --git a/n8n/compose.yaml b/n8n/compose.yaml index 1ae69ee..f6982ac 100644 --- a/n8n/compose.yaml +++ b/n8n/compose.yaml @@ -54,4 +54,4 @@ networks: volumes: node-data: - files: \ No newline at end of file + files: diff --git a/nextcloud/compose.yaml b/nextcloud/compose.yaml index 5469d70..323c641 100644 --- a/nextcloud/compose.yaml +++ b/nextcloud/compose.yaml @@ -5,7 +5,7 @@ services: restart: unless-stopped container_name: nextcloud-aio-mastercontainer # Do not change volumes: - - nextcloud_aio_mastercontainer:/mnt/docker-aio-config # Do not change (backup) + - nextcloud_aio_mastercontainer:/mnt/docker-aio-config # Do not change (backup) - /var/run/docker.sock:/var/run/docker.sock - /dev/dri:/dev/dri ports: diff --git a/termix/compose.yaml b/termix/compose.yaml index 590a1c5..7cd5c03 100644 --- a/termix/compose.yaml +++ b/termix/compose.yaml @@ -31,4 +31,4 @@ networks: proxy: external: true volumes: - data: \ No newline at end of file + data: diff --git a/traefik/compose.yaml b/traefik/compose.yaml index e1a036d..7df6ea5 100644 --- a/traefik/compose.yaml +++ b/traefik/compose.yaml @@ -32,7 +32,7 @@ services: # # STAGING # - "--certificatesresolvers.letsencrypt.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" - # Cloudflare + # Cloudflare - "--entryPoints.web.forwardedHeaders.trustedIPs=173.245.48.0/20,103.21.244.0/22,103.22.200.0/22,103.31.4.0/22,141.101.64.0/18,108.162.192.0/18,190.93.240.0/20,188.114.96.0/20,197.234.240.0/22,198.41.128.0/17,162.158.0.0/15,104.16.0.0/13,104.24.0.0/14,172.64.0.0/13,131.0.72.0/22" - "--entryPoints.websecure.forwardedHeaders.trustedIPs=173.245.48.0/20,103.21.244.0/22,103.22.200.0/22,103.31.4.0/22,141.101.64.0/18,108.162.192.0/18,190.93.240.0/20,188.114.96.0/20,197.234.240.0/22,198.41.128.0/17,162.158.0.0/15,104.16.0.0/13,104.24.0.0/14,172.64.0.0/13,131.0.72.0/22" # Logging diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index 70bbffa..7e569bd 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -1,4 +1,4 @@ http: serversTransports: insecureTransport: - insecureSkipVerify: true \ No newline at end of file + insecureSkipVerify: true diff --git a/uptime-kuma/compose.yaml b/uptime-kuma/compose.yaml index 33ddff1..f90b718 100644 --- a/uptime-kuma/compose.yaml +++ b/uptime-kuma/compose.yaml @@ -29,4 +29,4 @@ volumes: data: networks: proxy: - external: true \ No newline at end of file + external: true