diff --git a/.vscode/settings.json b/.vscode/settings.json index ce5d300..ac3ec66 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -104,6 +104,7 @@ "hyprland", "hyprwm", "INITDB", + "ioit", "iperf", "jmgilman", "jnoortheen", diff --git a/systems/jeeves-jr/arch_mirror.nix b/systems/jeeves-jr/arch_mirror.nix index 1220574..cfa65be 100644 --- a/systems/jeeves-jr/arch_mirror.nix +++ b/systems/jeeves-jr/arch_mirror.nix @@ -9,7 +9,6 @@ in "${../../users/richie/global/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/" "${vars.main_mirror}:/data" ]; - ports = [ "800:80" ]; extraOptions = [ "--network=web" ]; autoStart = true; }; diff --git a/systems/jeeves-jr/configuration.nix b/systems/jeeves-jr/configuration.nix index 6ed2878..7c45f78 100644 --- a/systems/jeeves-jr/configuration.nix +++ b/systems/jeeves-jr/configuration.nix @@ -15,32 +15,16 @@ useSystemdBoot = true; }; - environment = { - systemPackages = with pkgs; [ docker-compose ]; - etc = { - # Creates /etc/lynis/custom.prf - "lynis/custom.prf" = { - text = '' - skip-test=BANN-7126 - skip-test=BANN-7130 - skip-test=DEB-0520 - skip-test=DEB-0810 - skip-test=FIRE-4513 - skip-test=HRDN-7222 - skip-test=KRNL-5820 - skip-test=LOGG-2190 - skip-test=LYNIS - skip-test=TOOL-5002 - ''; - mode = "0440"; - }; - }; - }; + environment.systemPackages = with pkgs; [ docker-compose ]; services = { - nfs.server.enable = true; - - openssh.ports = [ 352 ]; + openssh = { + ports = [ 352 ]; + listenAddresses = [ + { addr = "192.168.95.35"; } + { addr = "192.168.90.35"; } + ]; + }; smartd.enable = true; diff --git a/systems/jeeves-jr/home_assistant.nix b/systems/jeeves-jr/home_assistant.nix index 5733653..02a09da 100644 --- a/systems/jeeves-jr/home_assistant.nix +++ b/systems/jeeves-jr/home_assistant.nix @@ -3,7 +3,14 @@ enable = true; openFirewall = true; config = { - server_port = 8123; + http = { + server_port = 8123; + server_host = [ + "192.168.95.35" + "192.168.90.35" + "192.168.98.4" + ]; + }; homeassistant = { time_zone = "America/New_York"; unit_system = "imperial"; diff --git a/systems/jeeves-jr/networking.nix b/systems/jeeves-jr/networking.nix index 3d19062..09d5314 100644 --- a/systems/jeeves-jr/networking.nix +++ b/systems/jeeves-jr/networking.nix @@ -6,12 +6,28 @@ systemd.network = { enable = true; + + netdevs = { + "20-ioit-vlan" = { + netdevConfig = { + Kind = "vlan"; + Name = "ioit-vlan"; + }; + vlanConfig.Id = 20; + }; + }; + networks = { "10-lan" = { matchConfig.Name = "enp4s0"; DHCP = "yes"; + vlan = [ "ioit-vlan" ]; linkConfig.RequiredForOnline = "routable"; }; + "40-ioit-vlan" = { + matchConfig.Name = "ioit-vlan"; + DHCP = "yes"; + }; }; }; @@ -20,3 +36,8 @@ joinNetworks = [ "e4da7455b2ae64ca" ]; }; } +# 22/tcp open ssh +# 800/tcp open mdbs_daemon +# 5355/tcp open llmnr +# 8123/tcp open polipo +# 9993/tcp open palace-2