From 4c3883a5e7a8f3a4cf084bc22f49984c27063f50 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Mon, 18 Mar 2024 20:08:24 +0000 Subject: [PATCH] remove sshd from wap profile It's not actually part of providing a wireless access point. --- examples/extneder.nix | 3 +++ modules/profiles/wap.nix | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/extneder.nix b/examples/extneder.nix index b86e607..802791b 100644 --- a/examples/extneder.nix +++ b/examples/extneder.nix @@ -12,6 +12,7 @@ ... }: let secrets = import ./extneder-secrets.nix; + svc = config.system.service; in rec { boot = { tftp = { @@ -23,6 +24,7 @@ in rec { imports = [ "${modulesPath}/profiles/wap.nix" "${modulesPath}/vlan" + "${modulesPath}/ssh" ]; hostname = "extneder"; @@ -80,6 +82,7 @@ in rec { }; }; + services.sshd = svc.ssh.build {}; users.root.passwd = lib.mkForce secrets.root.passwd; defaultProfile.packages = with pkgs; [nftables strace tcpdump swconfig]; } diff --git a/modules/profiles/wap.nix b/modules/profiles/wap.nix index 5c95e99..fdb3b41 100644 --- a/modules/profiles/wap.nix +++ b/modules/profiles/wap.nix @@ -40,7 +40,6 @@ in { ../network ../hostapd ../bridge - ../ssh { config.services = hostaps; } ]; @@ -54,7 +53,6 @@ in { }; }; config = { - services.sshd = svc.ssh.build {}; services.int = svc.bridge.primary.build { ifname = "int";