From cba0555c387d8af2adc71ac21bf818af6ba8a312 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Fri, 14 Mar 2025 16:07:32 +0100 Subject: [PATCH] `{host}.fleet` -> `{host}.wg.aciceri.dev` --- hmModules/shell/default.nix | 2 +- modules/home-assistant/default.nix | 3 +-- modules/mount-sisko/default.nix | 2 +- modules/nix/default.nix | 2 +- modules/prometheus/default.nix | 20 ++++++++++---------- modules/promtail/default.nix | 2 +- modules/syncthing/default.nix | 10 +++++----- modules/wireguard-common/default.nix | 2 +- packages/deploy/deploy.sh | 4 ++-- 9 files changed, 23 insertions(+), 24 deletions(-) diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix index 1d68741..17ac2bb 100644 --- a/hmModules/shell/default.nix +++ b/hmModules/shell/default.nix @@ -64,7 +64,7 @@ }; auto_sync = true; sync_frequency = "5m"; - sync_address = "http://sisko.fleet:8889"; + sync_address = "http://sisko.wg.aciceri.dev:8889"; search_mode = "fuzzy"; style = "compact"; }; diff --git a/modules/home-assistant/default.nix b/modules/home-assistant/default.nix index 9da252d..086e8e7 100644 --- a/modules/home-assistant/default.nix +++ b/modules/home-assistant/default.nix @@ -80,7 +80,6 @@ in time_zone = "Europe/Rome"; temperature_unit = "C"; external_url = "https://home.aciceri.dev"; - internal_url = "http://rock5b.fleet:8123"; }; logger.default = "WARNING"; wake_on_lan = { }; @@ -89,7 +88,7 @@ in name = "Picard"; platform = "wake_on_lan"; mac = "74:56:3c:37:17:bd"; # this shouldn't be public - host = "picard.fleet"; + host = "picard.wg.aciceri.dev"; turn_off.service = "shell_command.turn_off_picard"; } ]; diff --git a/modules/mount-sisko/default.nix b/modules/mount-sisko/default.nix index cd9d1d0..5233772 100644 --- a/modules/mount-sisko/default.nix +++ b/modules/mount-sisko/default.nix @@ -16,7 +16,7 @@ }; fileSystems."/mnt/nas" = { - device = "sisko.fleet:/hd"; + device = "sisko.wg.aciceri.dev:/hd"; fsType = "nfs"; options = [ "x-systemd.automount" diff --git a/modules/nix/default.nix b/modules/nix/default.nix index c6edb78..1b2258d 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -81,7 +81,7 @@ distributedBuilds = true; buildMachines = lib.lists.optional (config.networking.hostName == "picard") { - hostName = "sisko.fleet"; + hostName = "sisko.wg.aciceri.dev"; system = "aarch64-linux"; maxJobs = 7; supportedFeatures = [ diff --git a/modules/prometheus/default.nix b/modules/prometheus/default.nix index 382d4e8..5636fe6 100644 --- a/modules/prometheus/default.nix +++ b/modules/prometheus/default.nix @@ -8,11 +8,11 @@ in pushgateway = { enable = true; web = { - listen-address = "sisko.fleet:9094"; + listen-address = "sisko.wg.aciceri.dev:9094"; }; }; checkConfig = false; # Otherwise it will fail because it cannot access bearer_token_file - webExternalUrl = "https://status.aciceri.dev"; + webExternalUrl = "https://status.wg.aciceri.dev"; globalConfig.scrape_interval = "10s"; scrapeConfigs = [ { @@ -22,7 +22,7 @@ in static_configs = [ { targets = [ - "sisko.fleet:${builtins.toString config.services.home-assistant.config.http.server_port}" + "sisko.wg.aciceri.dev:${builtins.toString config.services.home-assistant.config.http.server_port}" ]; } ]; @@ -39,7 +39,7 @@ in job_name = "node"; static_configs = [ { - targets = builtins.map (host: "${host}.fleet:9100") [ + targets = builtins.map (host: "${host}.wg.aciceri.dev:9100") [ "sisko" "picard" "kirk" @@ -51,7 +51,7 @@ in job_name = "wireguard"; static_configs = [ { - targets = builtins.map (host: "${host}.fleet:9586") [ + targets = builtins.map (host: "${host}.wg.aciceri.dev:9586") [ "picard" "kirk" ]; @@ -62,7 +62,7 @@ in job_name = "zfs"; static_configs = [ { - targets = builtins.map (host: "${host}.fleet:9134") [ + targets = builtins.map (host: "${host}.wg.aciceri.dev:9134") [ "picard" "kirk" ]; @@ -73,7 +73,7 @@ in job_name = "restic"; static_configs = [ { - targets = builtins.map (host: "${host}.fleet:9753") [ "sisko" ]; + targets = builtins.map (host: "${host}.wg.aciceri.dev:9753") [ "sisko" ]; } ]; } @@ -81,7 +81,7 @@ in job_name = "postgres"; static_configs = [ { - targets = builtins.map (host: "${host}.fleet:9187") [ "sisko" ]; + targets = builtins.map (host: "${host}.wg.aciceri.dev:9187") [ "sisko" ]; } ]; } @@ -89,7 +89,7 @@ in job_name = "nginx"; static_configs = [ { - targets = builtins.map (host: "${host}.fleet:9117") [ "sisko" ]; + targets = builtins.map (host: "${host}.wg.aciceri.dev:9117") [ "sisko" ]; } ]; } @@ -97,7 +97,7 @@ in job_name = "smartctl"; static_configs = [ { - targets = builtins.map (host: "${host}.fleet:9633") [ + targets = builtins.map (host: "${host}.wg.aciceri.dev:9633") [ "sisko" "kirk" "picard" diff --git a/modules/promtail/default.nix b/modules/promtail/default.nix index f2ab2ef..e86afeb 100644 --- a/modules/promtail/default.nix +++ b/modules/promtail/default.nix @@ -12,7 +12,7 @@ let }; clients = [ { - url = "http://sisko.fleet:${ + url = "http://sisko.wg.aciceri.dev:${ builtins.toString config.services.loki.configuration.server.http_listen_port or 3100 }/loki/api/v1/push"; } diff --git a/modules/syncthing/default.nix b/modules/syncthing/default.nix index 2b2d607..4dacf98 100644 --- a/modules/syncthing/default.nix +++ b/modules/syncthing/default.nix @@ -3,7 +3,7 @@ services = { syncthing = { enable = true; - guiAddress = "${config.networking.hostName}.fleet:8434"; + guiAddress = "${config.networking.hostName}.wg.aciceri.dev:8434"; # TODO Use the home-manager module instead of the following conditions user = if config.networking.hostName == "sisko" then "syncthing" else "ccr"; dataDir = if config.networking.hostName == "sisko" then "/mnt/hd/syncthing" else "/home/ccr"; @@ -16,25 +16,25 @@ picard = { id = "XKSCJ46-EM6GIZ7-6ABQTZZ-ZRVWVFM-MJ3QNVG-F5EWHY5-ZUNYVSL-DA77YAG"; addresses = [ - "tcp://picard.fleet" + "tcp://picard.wg.aciceri.dev" ]; }; sisko = { id = "QE6V7PR-VHMAHHS-GHD4ZI3-IBB7FEM-M6EQZBX-YFCWDAK-YCYL6VO-NNRMXQK"; addresses = [ - "tcp://sisko.fleet" + "tcp://sisko.wg.aciceri.dev" ]; }; kirk = { id = "OVPXSCE-XFKCBJ2-A4SKJRI-DYBZ6CV-U2OFNA2-ALHOPW5-PPMHOIQ-5TG2HAJ"; addresses = [ - "tcp://kirk.fleet" + "tcp://kirk.wg.aciceri.dev" ]; }; oneplus8t = { id = "KMB2YRF-DGTWU24-SLITU23-5TN7BMQ-6PFAQQZ-CZ7J2QL-PIGVBTU-VRFRMQV"; addresses = [ - "tcp://oneplus8t.fleet" + "tcp://oneplus8t.wg.aciceri.dev" ]; }; }; diff --git a/modules/wireguard-common/default.nix b/modules/wireguard-common/default.nix index ad50ad8..491bc54 100644 --- a/modules/wireguard-common/default.nix +++ b/modules/wireguard-common/default.nix @@ -27,6 +27,6 @@ networking.hosts = lib.mapAttrs' (hostname: vpnConfig: { name = vpnConfig.ip; - value = [ "${hostname}.fleet" ]; + value = [ "${hostname}.wg.aciceri.dev" ]; }) vpn; } diff --git a/packages/deploy/deploy.sh b/packages/deploy/deploy.sh index 9e9715b..8823453 100644 --- a/packages/deploy/deploy.sh +++ b/packages/deploy/deploy.sh @@ -2,8 +2,8 @@ host=${1-picard} nixos-rebuild switch \ --flake ".#${host}" \ - --target-host "root@${host}.fleet" \ - --build-host "root@${host}.fleet" \ + --target-host "root@${host}.wg.aciceri.dev" \ + --build-host "root@${host}.wg.aciceri.dev" \ --option warn-dirty false \ --fast \ "${@:2}"