From 7abcbd68ee9f36d02c9e8b8483872881633132c2 Mon Sep 17 00:00:00 2001 From: notohh Date: Wed, 14 Jun 2023 02:59:32 -0400 Subject: [PATCH] hosts: searxng -> yuki, remove homepage, init dashdot / homarr --- hosts/sakura/services/dashdot.nix | 14 +++++++++++++ hosts/sakura/services/default.nix | 4 ++-- hosts/sakura/services/homepage.nix | 12 ----------- hosts/sakura/services/traefik.nix | 19 +++++++----------- hosts/yuki/services/dashdot.nix | 14 +++++++++++++ hosts/yuki/services/default.nix | 3 +++ hosts/yuki/services/homarr.nix | 12 +++++++++++ hosts/{sakura => yuki}/services/searxng.nix | 2 +- hosts/yuki/services/traefik.nix | 22 +++++++++++++++++++-- 9 files changed, 73 insertions(+), 29 deletions(-) create mode 100644 hosts/sakura/services/dashdot.nix delete mode 100644 hosts/sakura/services/homepage.nix create mode 100644 hosts/yuki/services/dashdot.nix create mode 100644 hosts/yuki/services/homarr.nix rename hosts/{sakura => yuki}/services/searxng.nix (93%) diff --git a/hosts/sakura/services/dashdot.nix b/hosts/sakura/services/dashdot.nix new file mode 100644 index 0000000..b04312a --- /dev/null +++ b/hosts/sakura/services/dashdot.nix @@ -0,0 +1,14 @@ +{...}: { + virtualisation.oci-containers.containers.dashdot = { + image = "mauricenino/dashdot"; + ports = [ + "4000:3001" + ]; + volumes = [ + "/home/notoh/docker/dashdot:/mnt/host:ro" + ]; + environment = { + DASHDOT_ENABLE_CPU_TEMPS = "true"; + }; + }; +} diff --git a/hosts/sakura/services/default.nix b/hosts/sakura/services/default.nix index 3e918d4..94dacff 100644 --- a/hosts/sakura/services/default.nix +++ b/hosts/sakura/services/default.nix @@ -1,8 +1,6 @@ {...}: { imports = [ ./traefik.nix - ./homepage.nix - ./searxng.nix ./hugo.nix ./foundryvtt.nix ./forgejo.nix @@ -12,5 +10,7 @@ ./prometheus.nix ./woodpecker.nix ./atticd.nix + ./hedgedoc.nix + ./dashdot.nix ]; } diff --git a/hosts/sakura/services/homepage.nix b/hosts/sakura/services/homepage.nix deleted file mode 100644 index fa65d39..0000000 --- a/hosts/sakura/services/homepage.nix +++ /dev/null @@ -1,12 +0,0 @@ -_: { - virtualisation.oci-containers.containers.homepage = { - image = "ghcr.io/benphelps/homepage:v0.6.21"; - volumes = [ - "/home/notoh/docker/homepage:/app/config" - "/var/run/docker.sock:/var/run/docker.sock:ro" - ]; - ports = [ - "3005:3000" - ]; - }; -} diff --git a/hosts/sakura/services/traefik.nix b/hosts/sakura/services/traefik.nix index 4f0089f..47e3500 100644 --- a/hosts/sakura/services/traefik.nix +++ b/hosts/sakura/services/traefik.nix @@ -19,21 +19,16 @@ entryPoints = ["websecure"]; service = "api@internal"; }; - homepage = { - rule = "Host(`dashboard.home.arpa`)"; - entrypoints = ["web"]; - service = "homepage"; - }; - searxng = { - rule = "Host(`searxng.home.arpa`)"; - entrypoints = ["web"]; - service = "searxng"; - }; jellyfin = { rule = "Host(`jellyfin.home.arpa`)"; entrypoints = ["web"]; service = "jellyfin"; }; + dashdot = { + rule = "Host(`dashdot.sakura.home.arpa`)"; + entrypoints = ["web"]; + service = "dashdot"; + }; hugo = { rule = "Host(`notohh.dev`)"; entryPoints = ["websecure"]; @@ -92,10 +87,9 @@ }; }; services = { - homepage.loadBalancer.servers = [{url = "http://localhost:3005";}]; - searxng.loadBalancer.servers = [{url = "http://localhost:8085";}]; hugo.loadBalancer.servers = [{url = "http://localhost:1313";}]; jellyfin.loadBalancer.servers = [{url = "http://localhost:8096";}]; + dashdot.loadBalancer.servers = [{url = "http://localhost:4000";}]; foundryvtt.loadBalancer.servers = [{url = "http://localhost:30000";}]; gitea.loadBalancer.servers = [{url = "http://localhost:3200";}]; rustypaste.loadBalancer.servers = [{url = "http://localhost:8000";}]; @@ -120,6 +114,7 @@ }; web = { address = ":80"; + forwardedHeaders.insecure = true; }; }; certificatesResolvers = { diff --git a/hosts/yuki/services/dashdot.nix b/hosts/yuki/services/dashdot.nix new file mode 100644 index 0000000..b04312a --- /dev/null +++ b/hosts/yuki/services/dashdot.nix @@ -0,0 +1,14 @@ +{...}: { + virtualisation.oci-containers.containers.dashdot = { + image = "mauricenino/dashdot"; + ports = [ + "4000:3001" + ]; + volumes = [ + "/home/notoh/docker/dashdot:/mnt/host:ro" + ]; + environment = { + DASHDOT_ENABLE_CPU_TEMPS = "true"; + }; + }; +} diff --git a/hosts/yuki/services/default.nix b/hosts/yuki/services/default.nix index a21f51d..7ecb419 100644 --- a/hosts/yuki/services/default.nix +++ b/hosts/yuki/services/default.nix @@ -4,5 +4,8 @@ ./traefik.nix ./kanboard.nix ./stash.nix + ./searxng.nix + ./homarr.nix + ./dashdot.nix ]; } diff --git a/hosts/yuki/services/homarr.nix b/hosts/yuki/services/homarr.nix new file mode 100644 index 0000000..ba06172 --- /dev/null +++ b/hosts/yuki/services/homarr.nix @@ -0,0 +1,12 @@ +{...}: { + virtualisation.oci-containers.containers.homarr = { + image = "ghcr.io/ajnart/homarr:0.12.3"; + ports = [ + "7575:7575" + ]; + volumes = [ + "/home/notohh/docker/homarr/configs:/app/data/configs" + "/home/notohh/docker/homarr/icons:/app/public/icons" + ]; + }; +} diff --git a/hosts/sakura/services/searxng.nix b/hosts/yuki/services/searxng.nix similarity index 93% rename from hosts/sakura/services/searxng.nix rename to hosts/yuki/services/searxng.nix index 6d0d5a9..c5ba505 100644 --- a/hosts/sakura/services/searxng.nix +++ b/hosts/yuki/services/searxng.nix @@ -8,7 +8,7 @@ _: { INSTANCE_NAME = "SearXNG"; }; ports = [ - "8085:8080" + "8100:8080" ]; }; } diff --git a/hosts/yuki/services/traefik.nix b/hosts/yuki/services/traefik.nix index 008b3db..05ec70f 100644 --- a/hosts/yuki/services/traefik.nix +++ b/hosts/yuki/services/traefik.nix @@ -20,10 +20,22 @@ _: { entrypoints = ["web"]; service = "stash"; }; + homarr = { + rule = "Host(`dashboard.home.arpa`)"; + entrypoints = ["web"]; + service = "homarr"; + }; + dashdot = { + rule = "Host(`dashdot.yuki.home.arpa`)"; + entrypoints = ["web"]; + service = "dashdot"; + }; }; services = { kanboard.loadBalancer.servers = [{url = "http://localhost:8080";}]; stash.loadBalancer.servers = [{url = "http://localhost:9999";}]; + homarr.loadBalancer.servers = [{url = "http://localhost:7575";}]; + dashdot.loadBalancer.servers = [{url = "http://localhost:4000";}]; }; }; }; @@ -36,8 +48,14 @@ _: { sendAnonymousUsage = false; }; entryPoints = { - websecure.address = ":443"; - web.address = ":80"; + websecure = { + address = ":443"; + forwardedHeaders.insecure = true; + }; + web = { + address = ":80"; + forwardedHeaders.insecure = true; + }; }; }; };