diff --git a/common/optional/monitoring-agent.nix b/common/optional/monitoring-agent.nix index 49f1f47..06fe8bc 100644 --- a/common/optional/monitoring-agent.nix +++ b/common/optional/monitoring-agent.nix @@ -5,7 +5,7 @@ ... }: let - monitoringInterface = "ztwfunumly"; + monitoringInterface = "tailscale0"; nodeTextfileDir = "/var/lib/prometheus-node-exporter-textfile"; mkProcessNameTemplate = diff --git a/python/ebook_search/config.py b/python/ebook_search/config.py index 8b7d4dd..510426f 100644 --- a/python/ebook_search/config.py +++ b/python/ebook_search/config.py @@ -37,7 +37,7 @@ class RerankConfig(BaseSettings): model_config = SettingsConfigDict(env_prefix="EBOOK_SEARCH_RERANK_", frozen=True, protected_namespaces=()) enabled: bool = True - base_url: str = "http://192.168.90.25:8001" + base_url: str = "http://bob:8001" model: str = "qwen3-reranker-06b" candidates: int = 24 timeout_seconds: float = 30.0 @@ -67,7 +67,7 @@ class EbookSearchConfig(BaseSettings): ) chat_model: str = "deepseek-v4-flash" answer_enabled: bool = True - embedding_base_url: str = "http://192.168.90.25:8000/v1" + embedding_base_url: str = "http://bob:8000/v1" embedding_api_key: str = "not-needed" embedding_model: str = "qwen3-embedding-0.6b" embedding_batch_size: int = 32 diff --git a/python/ebook_search/docker/docker-compose.yml b/python/ebook_search/docker/docker-compose.yml index 37e1f42..ffedd57 100644 --- a/python/ebook_search/docker/docker-compose.yml +++ b/python/ebook_search/docker/docker-compose.yml @@ -9,8 +9,6 @@ services: restart: unless-stopped ports: - "${EBOOK_SEARCH_PORT:-8070}:8070" - extra_hosts: - - "jeeves:192.168.90.40" env_file: - ../../../.env environment: diff --git a/systems/brain/services/home_assistant.nix b/systems/brain/services/home_assistant.nix index dd53725..3d77423 100644 --- a/systems/brain/services/home_assistant.nix +++ b/systems/brain/services/home_assistant.nix @@ -86,7 +86,7 @@ esphome = { enable = true; openFirewall = true; - address = "192.168.90.35"; + address = "0.0.0.0"; }; }; } diff --git a/systems/brain/services/postgress.nix b/systems/brain/services/postgress.nix index 822ec69..fc980df 100644 --- a/systems/brain/services/postgress.nix +++ b/systems/brain/services/postgress.nix @@ -19,7 +19,7 @@ local all richie trust host all richie 127.0.0.1/32 trust host all richie ::1/128 trust - host all richie 192.168.90.1/24 trust + host all richie 100.64.0.0/10 trust host all richie 192.168.99.1/24 trust local vaninventory vaninventory trust @@ -28,7 +28,7 @@ local hass hass trust # ipv4 - host hass hass 192.168.90.1/24 trust + host hass hass 100.64.0.0/10 trust host hass hass 127.0.0.1/32 trust # ipv6 diff --git a/systems/brain/syncthing.nix b/systems/brain/syncthing.nix index e952379..08204ea 100644 --- a/systems/brain/syncthing.nix +++ b/systems/brain/syncthing.nix @@ -3,7 +3,7 @@ services.syncthing = { overrideFolders = false; - guiAddress = "192.168.90.35:8384"; + guiAddress = "0.0.0.0:8384"; settings = { "dotfiles" = { path = "/home/richie/dotfiles"; diff --git a/systems/jeeves/monitoring/default.nix b/systems/jeeves/monitoring/default.nix index 191746b..acc91ec 100644 --- a/systems/jeeves/monitoring/default.nix +++ b/systems/jeeves/monitoring/default.nix @@ -41,29 +41,29 @@ let { job_name = "node"; static_configs = [ - (mkTarget "jeeves" "192.168.90.40:9100") - (mkTarget "bob" "192.168.90.25:9100") + (mkTarget "jeeves" "jeeves.taile39c31.ts.net:9100") + (mkTarget "bob" "bob.taile39c31.ts.net:9100") ]; } { job_name = "process_grouped"; static_configs = [ - (mkTarget "jeeves" "192.168.90.40:9256") - (mkTarget "bob" "192.168.90.25:9256") + (mkTarget "jeeves" "jeeves.taile39c31.ts.net:9256") + (mkTarget "bob" "bob.taile39c31.ts.net:9256") ]; } { job_name = "smartctl"; static_configs = [ - (mkTarget "jeeves" "192.168.90.40:9633") - (mkTarget "bob" "192.168.90.25:9633") + (mkTarget "jeeves" "jeeves.taile39c31.ts.net:9633") + (mkTarget "bob" "bob.taile39c31.ts.net:9633") ]; } { job_name = "zfs"; static_configs = [ - (mkTarget "jeeves" "192.168.90.40:9134") - (mkTarget "bob" "192.168.90.25:9134") + (mkTarget "jeeves" "jeeves.taile39c31.ts.net:9134") + (mkTarget "bob" "bob.taile39c31.ts.net:9134") ]; } ]; @@ -79,8 +79,8 @@ let { job_name = "process_pid"; static_configs = [ - (mkTarget "jeeves" "192.168.90.40:9257") - (mkTarget "bob" "192.168.90.25:9257") + (mkTarget "jeeves" "jeeves.taile39c31.ts.net:9257") + (mkTarget "bob" "bob.taile39c31.ts.net:9257") ]; } ]; @@ -97,7 +97,9 @@ let after = [ "zfs-media-database-prometheus.mount" "network.target" + "tailscaled-autoconnect.service" ]; + wants = [ "tailscaled-autoconnect.service" ]; requires = [ "zfs-media-database-prometheus.mount" ]; wantedBy = [ "multi-user.target" ]; unitConfig.RequiresMountsFor = [ dataDir ]; diff --git a/systems/jeeves/services/grafana.nix b/systems/jeeves/services/grafana.nix index 8e925c9..b259127 100644 --- a/systems/jeeves/services/grafana.nix +++ b/systems/jeeves/services/grafana.nix @@ -19,9 +19,9 @@ in secret_key = "$__file{${vars.secrets}/services/grafana/secret_key}"; }; server = { - http_addr = "192.168.90.40"; + http_addr = "0.0.0.0"; http_port = 3000; - root_url = "http://192.168.90.40:3000/"; + root_url = "http://jeeves:3000/"; }; }; provision = { diff --git a/systems/jeeves/services/postgress.nix b/systems/jeeves/services/postgress.nix index 371b59a..2e4ff40 100644 --- a/systems/jeeves/services/postgress.nix +++ b/systems/jeeves/services/postgress.nix @@ -27,7 +27,7 @@ in local all richie trust host all richie 127.0.0.1/32 trust host all richie ::1/128 trust - host all richie 192.168.90.1/24 trust + host all richie 100.64.0.0/10 trust host all richie 192.168.99.1/24 trust host all richie 172.16.0.0/12 trust @@ -42,12 +42,12 @@ in local postgres math trust host postgres math 127.0.0.1/32 trust host postgres math ::1/128 trust - host postgres math 192.168.90.1/24 trust + host postgres math 100.64.0.0/10 trust local data_science_dev math trust host data_science_dev math 127.0.0.1/32 trust host data_science_dev math ::1/128 trust - host data_science_dev math 192.168.90.1/24 trust + host data_science_dev math 100.64.0.0/10 trust ''; identMap = '' diff --git a/systems/jeeves/services/transmission.nix b/systems/jeeves/services/transmission.nix index 93bd255..f489815 100644 --- a/systems/jeeves/services/transmission.nix +++ b/systems/jeeves/services/transmission.nix @@ -21,11 +21,11 @@ in message-level = 3; peer-port = 51413; rpc-bind-address = "0.0.0.0"; - rpc-host-whitelist = "127.0.0.1,192.168.90.40"; + rpc-host-whitelist = "127.0.0.1,jeeves,jeeves.taile39c31.ts.net"; rpc-host-whitelist-enabled = true; rpc-port = 9091; rpc-whitelist-enabled = true; - rpc-whitelist = "127.0.0.1,192.168.90.49"; + rpc-whitelist = "127.0.0.1,100.*.*.*"; seed-queue-enabled = false; }; }; diff --git a/systems/jeeves/syncthing.nix b/systems/jeeves/syncthing.nix index 625187b..df9aaf0 100644 --- a/systems/jeeves/syncthing.nix +++ b/systems/jeeves/syncthing.nix @@ -2,11 +2,11 @@ let vars = import ./vars.nix; in { - networking.firewall.allowedTCPPorts = [ 8384 ]; + networking.firewall.interfaces.tailscale0.allowedTCPPorts = [ 8384 ]; services.syncthing = { overrideFolders = false; - guiAddress = "192.168.90.40:8384"; + guiAddress = "0.0.0.0:8384"; settings = { devices.davids-server.id = "7GXTDGR-AOXFW2O-K6J7NM3-XYZNRRW-AKHAFWM-GBOWUPQ-OA6JIWD-ER7RDQL"; # cspell:disable-line folders = { diff --git a/tests/ebook_search/test_rerank.py b/tests/ebook_search/test_rerank.py index f32c45c..c62002f 100644 --- a/tests/ebook_search/test_rerank.py +++ b/tests/ebook_search/test_rerank.py @@ -51,7 +51,7 @@ def test_config_defaults_enable_reranking(mocker: MockerFixture) -> None: config = load_rerank_config() assert config.enabled is True - assert config.base_url == "http://192.168.90.25:8001" + assert config.base_url == "http://bob:8001" assert config.model == "qwen3-reranker-06b" assert config.candidates == 24 assert config.timeout_seconds == 30 diff --git a/users/richie/home/gui/vscode/settings.json b/users/richie/home/gui/vscode/settings.json index b555ddd..c75ea7f 100644 --- a/users/richie/home/gui/vscode/settings.json +++ b/users/richie/home/gui/vscode/settings.json @@ -35,7 +35,7 @@ "sqltools.connections": [ { "previewLimit": 50, - "server": "192.168.90.40", + "server": "jeeves.taile39c31.ts.net", "port": 5432, "askForPassword": true, "driver": "PostgreSQL", diff --git a/users/richie/home/ssh_config.nix b/users/richie/home/ssh_config.nix index 9074a26..7a42c0f 100644 --- a/users/richie/home/ssh_config.nix +++ b/users/richie/home/ssh_config.nix @@ -4,7 +4,7 @@ enableDefaultConfig = false; settings = { jeeves = { - HostName = "192.168.90.40"; + HostName = "jeeves"; User = "richie"; IdentityFile = "~/.ssh/id_ed25519"; Port = 629; @@ -18,7 +18,7 @@ Port = 2222; }; brain = { - HostName = "192.168.90.35"; + HostName = "brain"; User = "richie"; IdentityFile = "~/.ssh/id_ed25519"; Port = 129; @@ -31,14 +31,14 @@ Port = 2222; }; bob = { - HostName = "192.168.90.25"; + HostName = "bob"; User = "richie"; IdentityFile = "~/.ssh/id_ed25519"; Port = 262; DynamicForward = [ { port = 9050; } ]; }; rhapsody-in-green = { - HostName = "192.168.90.221"; + HostName = "rhapsody-in-green"; User = "richie"; IdentityFile = "~/.ssh/id_ed25519"; Port = 922;