diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml index 11642ad..24904d9 100644 --- a/docker/authentik/docker-compose.toml +++ b/docker/authentik/docker-compose.toml @@ -24,19 +24,6 @@ volumes = [ ] env_file = [".env"] networks = ["authentik", "postgres", "proxy"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.authentik-redirect.entrypoints=http", - "traefik.http.routers.authentik-redirect.rule=Host(`sso.korhonen.cc`)", - "traefik.http.routers.authentik-redirect.middlewares=http2https@file", - "traefik.http.routers.authentik.entrypoints=https", - "traefik.http.routers.authentik.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.authentik-rtr-outpost.rule=HostRegexp(`{subdomain:[a-z0-9-]+}.korhonen.cc`) && PathPrefix(`/outpost.goauthentik.io/`)", - "traefik.http.routers.authentik.rule=Host(`sso.korhonen.cc`)", - "traefik.http.routers.authentik.service=authentik", - "traefik.http.services.authentik.loadbalancer.server.port=9000", -] [services.worker] image = "ghcr.io/goauthentik/server" @@ -73,19 +60,6 @@ restart = "unless-stopped" security_opt = ["no-new-privileges:true"] networks = ["proxy"] environment = ["TZ"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.whoami-test-redirect.entrypoints=http", - "traefik.http.routers.whoami-test-redirect.rule=Host(`whoami-test.korhonen.cc`)", - "traefik.http.routers.whoami-test-redirect.middlewares=http2https@file", - "traefik.http.routers.whoami-test.entrypoints=https", - "traefik.http.routers.whoami-test.middlewares=secHeaders@file,compress@file,authentik@file", - "traefik.http.routers.whoami-test.rule=Host(`whoami-test.korhonen.cc`)", - "traefik.http.routers.whoami-test.service=whoami-test", - "traefik.http.services.whoami-test.loadbalancer.server.port=80", -] - [networks.authentik] external = true diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index c9856e0..d428c4a 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -37,6 +37,11 @@ korhonen.cc, *.korhonen.cc { reverse_proxy forgejo:3000 } + @woodpecker host ci.korhonen.cc + handle @woodpecker { + reverse_proxy woodpecker:8000 + } + @searx host search.korhonen.cc handle @searx { reverse_proxy searx:8080 diff --git a/docker/freshrss/docker-compose.toml b/docker/freshrss/docker-compose.toml index e249c3c..cfd76b9 100644 --- a/docker/freshrss/docker-compose.toml +++ b/docker/freshrss/docker-compose.toml @@ -1,5 +1,3 @@ -[services] - [services.freshrss] image = "linuxserver/freshrss" container_name = "freshrss" @@ -10,20 +8,6 @@ volumes = [ "/docker/freshrss/freshrss:/config", "/etc/localtime:/etc/localtime:ro", ] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.freshrss-redirect.entrypoints=http", - "traefik.http.routers.freshrss-redirect.rule=Host(`rss.korhonen.cc`)", - "traefik.http.routers.freshrss-redirect.middlewares=http2https@file", - "traefik.http.routers.freshrss.entrypoints=https", - "traefik.http.routers.freshrss.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.freshrss.rule=Host(`rss.korhonen.cc`)", - "traefik.http.routers.freshrss.service=freshrss", - "traefik.http.services.freshrss.loadbalancer.server.port=80", -] - -[networks] [networks.freshrss] external = false diff --git a/docker/headscale/docker-compose.toml b/docker/headscale/docker-compose.toml index 40fad9e..fff546b 100644 --- a/docker/headscale/docker-compose.toml +++ b/docker/headscale/docker-compose.toml @@ -9,35 +9,11 @@ ports = ["3478:3478/udp"] command = "headscale serve" restart = "unless-stopped" networks = ["postgres"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.headscale-redirect.entrypoints=http", - "traefik.http.routers.headscale-redirect.rule=PathPrefix(`/`)&&Host(`headscale.korhonen.cc`)", - "traefik.http.routers.headscale-redirect.middlewares=http2https@file", - "traefik.http.routers.headscale.entrypoints=https", - "traefik.http.routers.headscale.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.headscale.rule=PathPrefix(`/`) && Host(`headscale.korhonen.cc`)", - "traefik.http.routers.headscale.service=headscale", - "traefik.http.services.headscale.loadbalancer.server.port=8080", -] [services.headscale-ui] image = "ghcr.io/gurucomputing/headscale-ui" container_name = "headscale-ui" restart = "unless-stopped" -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.headscale-ui-redirect.entrypoints=http", - "traefik.http.routers.headscale-ui-redirect.rule=PathPrefix(`/web`)&&Host(`headscale.korhonen.cc`)", - "traefik.http.routers.headscale-ui-redirect.middlewares=http2https@file", - "traefik.http.routers.headscale-ui.entrypoints=https", - "traefik.http.routers.headscale-ui.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.headscale-ui.rule=PathPrefix(`/web`)&&Host(`headscale.korhonen.cc`)", - "traefik.http.routers.headscale-ui.service=headscale-ui", - "traefik.http.services.headscale-ui.loadbalancer.server.port=80", -] [networks.postgres] external = true diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml index 53187d2..6f1eac5 100644 --- a/docker/homeautomation/docker-compose.toml +++ b/docker/homeautomation/docker-compose.toml @@ -12,18 +12,6 @@ networks = ["homeautomation", "postgres", "proxy"] ports = ["8123:8123", "8300:8300"] extra_hosts = ["host.docker.internal:host-gateway"] depends_on = ["mosquitto"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.home-assistant-redirect.entrypoints=http", - "traefik.http.routers.home-assistant-redirect.rule=Host(`home.korhonen.cc`)", - "traefik.http.routers.home-assistant-redirect.middlewares=http2https@file", - "traefik.http.routers.home-assistant.entrypoints=https", - "traefik.http.routers.home-assistant.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.home-assistant.rule=Host(`home.korhonen.cc`)", - "traefik.http.routers.home-assistant.service=home-assistant", - "traefik.http.services.home-assistant.loadbalancer.server.port=8123", -] [services.esphome] container_name = "esphome" diff --git a/docker/korhonen.cc/docker-compose.toml b/docker/korhonen.cc/docker-compose.toml deleted file mode 100644 index db89511..0000000 --- a/docker/korhonen.cc/docker-compose.toml +++ /dev/null @@ -1,28 +0,0 @@ -[services] - -[services.nginx] -image = "nginx" -container_name = "korhonen.cc" -volumes = [ - "/var/www/korhonen.cc:/korhonen.cc:ro", - "./nginx.conf:/etc/nginx/conf.d/default.conf", -] -networks = ["proxy"] -restart = "unless-stopped" -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.korhonen-redirect.entrypoints=http", - "traefik.http.routers.korhonen-redirect.rule=Host(`korhonen.cc`) || Host(`www.korhonen.cc`)", - "traefik.http.routers.korhonen-redirect.middlewares=www2non-www@file,http2https@file", - "traefik.http.routers.korhonen.entrypoints=https", - "traefik.http.routers.korhonen.middlewares=secHeaders@file,www2non-www@file,compress@file", - "traefik.http.routers.korhonen.rule=Host(`korhonen.cc`) || Host(`www.korhonen.cc`)", - "traefik.http.routers.korhonen.service=korhonen", - "traefik.http.services.korhonen.loadbalancer.server.port=80", -] - -[networks] - -[networks.proxy] -external = true diff --git a/docker/korhonen.cc/nginx.conf b/docker/korhonen.cc/nginx.conf deleted file mode 100644 index 1839292..0000000 --- a/docker/korhonen.cc/nginx.conf +++ /dev/null @@ -1,30 +0,0 @@ -server { - listen 80; - listen [::]:80; - server_name localhost; - - location / { - root /korhonen.cc; - index index.html; - - location ~* \.(?:css|js|jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc)$ { - expires 1M; - access_log off; - add_header Cache-Control "public"; - } - - location /fi { - error_page 404 /fi/404.html; - } - } - - # Use hugo 404 page - error_page 404 /404.html; - - # Redirect 5xx to standard error pages - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } -} - diff --git a/docker/remotely/docker-compose.toml b/docker/remotely/docker-compose.toml deleted file mode 100644 index 43ec6e6..0000000 --- a/docker/remotely/docker-compose.toml +++ /dev/null @@ -1,24 +0,0 @@ -[services] - -[services.remotely] -image = "translucency/remotely" -container_name = "remotely" -networks = ["proxy"] -volumes = ["/docker/remotely:/remotely-data"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.remotely-redirect.entrypoints=http", - "traefik.http.routers.remotely-redirect.rule=Host(`remotely.korhonen.cc`)", - "traefik.http.routers.remotely-redirect.middlewares=http2https@file", - "traefik.http.routers.remotely.entrypoints=https", - "traefik.http.routers.remotely.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.remotely.rule=Host(`remotely.korhonen.cc`)", - "traefik.http.routers.remotely.service=remotely", - "traefik.http.services.remotely.loadbalancer.server.port=5000", -] - -[networks] - -[networks.proxy] -external = true diff --git a/docker/searx/docker-compose.toml b/docker/searx/docker-compose.toml index 9617520..f2c1dd7 100644 --- a/docker/searx/docker-compose.toml +++ b/docker/searx/docker-compose.toml @@ -10,18 +10,6 @@ volumes = [ environment = ["SEARXNG_BASE_URL=https://search.korhonen.cc/"] cap_drop = ["ALL"] cap_add = ["CHOWN", "SETGID", "SETUID", "DAC_OVERRIDE"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.searx-redirect.entrypoints=http", - "traefik.http.routers.searx-redirect.rule=Host(`search.korhonen.cc`)", - "traefik.http.routers.searx-redirect.middlewares=http2https@file", - "traefik.http.routers.searx.entrypoints=https", - "traefik.http.routers.searx.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.searx.rule=Host(`search.korhonen.cc`)", - "traefik.http.routers.searx.service=searx", - "traefik.http.services.searx.loadbalancer.server.port=8080", -] [services.searx.logging] driver = "json-file" diff --git a/docker/wkd/docker-compose.toml b/docker/wkd/docker-compose.toml deleted file mode 100644 index 7e3a707..0000000 --- a/docker/wkd/docker-compose.toml +++ /dev/null @@ -1,21 +0,0 @@ -[services.wkd] -image = "nginx" -container_name = "wkd" -volumes = [ - "/var/www/wkd:/wkd:ro", - "./nginx.conf:/etc/nginx/conf.d/default.conf", -] -networks = ["proxy"] -restart = "unless-stopped" -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.wkd.entrypoints=https", - "traefik.http.routers.wkd.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.wkd.rule=Host(`openpgpkey.korhonen.cc`)", - "traefik.http.routers.wkd.service=wkd", - "traefik.http.services.wkd.loadbalancer.server.port=80", -] - -[networks.proxy] -external = true diff --git a/docker/wkd/nginx.conf b/docker/wkd/nginx.conf deleted file mode 100644 index e4ebdac..0000000 --- a/docker/wkd/nginx.conf +++ /dev/null @@ -1,15 +0,0 @@ -server { - listen 80; - listen [::]:80; - root /wkd; - - location /.well-known/openpgpkey/korhonen.cc/hu/ { - default_type "application/octet-stream"; - add_header Access-Control-Allow-Origin * always; - } - - location / { - return 301 https://keyoxide.org/wkd/marko%40korhonen.cc; - } -} - diff --git a/docker/woodpecker/docker-compose.toml b/docker/woodpecker/docker-compose.toml index 551bb54..7a4c823 100644 --- a/docker/woodpecker/docker-compose.toml +++ b/docker/woodpecker/docker-compose.toml @@ -15,18 +15,6 @@ environment = [ "WOODPECKER_ADMIN=FunctionalHacker", ] networks = ["proxy", "default"] -labels = [ - "traefik.enable=true", - "traefik.docker.network=proxy", - "traefik.http.routers.woodpecker-redirect.entrypoints=http", - "traefik.http.routers.woodpecker-redirect.rule=Host(`ci.korhonen.cc`)", - "traefik.http.routers.woodpecker-redirect.middlewares=http2https@file", - "traefik.http.routers.woodpecker.entrypoints=https", - "traefik.http.routers.woodpecker.middlewares=secHeaders@file,compress@file", - "traefik.http.routers.woodpecker.rule=Host(`ci.korhonen.cc`)", - "traefik.http.routers.woodpecker.service=woodpecker", - "traefik.http.services.woodpecker.loadbalancer.server.port=8000", -] [services.woodpecker-agent] image = "woodpeckerci/woodpecker-agent"