summaryrefslogtreecommitdiff
path: root/system-profiles
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2023-03-04 19:23:36 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2023-03-04 19:23:36 +0100
commit29480b6e86ca6057d4151accdb5d4103f1657596 (patch)
treeaad8ef8a38f2b679ff64039d6a2445eba9041d09 /system-profiles
parent7fcaba2d4cabc8d5dfd35648ec1b9b6795e490ec (diff)
downloadnixos-29480b6e86ca6057d4151accdb5d4103f1657596.tar
nixos-29480b6e86ca6057d4151accdb5d4103f1657596.tar.gz
nixos-29480b6e86ca6057d4151accdb5d4103f1657596.tar.bz2
nixos-29480b6e86ca6057d4151accdb5d4103f1657596.tar.xz
nixos-29480b6e86ca6057d4151accdb5d4103f1657596.zip
...
Diffstat (limited to 'system-profiles')
-rw-r--r--system-profiles/initrd-ssh/module.nix10
-rw-r--r--system-profiles/openssh/default.nix2
2 files changed, 6 insertions, 6 deletions
diff --git a/system-profiles/initrd-ssh/module.nix b/system-profiles/initrd-ssh/module.nix
index 9ea469b2..18a50cbf 100644
--- a/system-profiles/initrd-ssh/module.nix
+++ b/system-profiles/initrd-ssh/module.nix
@@ -122,13 +122,13 @@ in
122 HostKey ${initrdKeyPath path} 122 HostKey ${initrdKeyPath path}
123 '')} 123 '')}
124 124
125 KexAlgorithms ${concatStringsSep "," sshdCfg.kexAlgorithms} 125 KexAlgorithms ${concatStringsSep "," sshdCfg.settings.KexAlgorithms}
126 Ciphers ${concatStringsSep "," sshdCfg.ciphers} 126 Ciphers ${concatStringsSep "," sshdCfg.settings.Ciphers}
127 MACs ${concatStringsSep "," sshdCfg.macs} 127 MACs ${concatStringsSep "," sshdCfg.settings.Macs}
128 128
129 LogLevel ${sshdCfg.logLevel} 129 LogLevel ${sshdCfg.settings.LogLevel}
130 130
131 ${if sshdCfg.useDns then '' 131 ${if sshdCfg.settings.UseDns then ''
132 UseDNS yes 132 UseDNS yes
133 '' else '' 133 '' else ''
134 UseDNS no 134 UseDNS no
diff --git a/system-profiles/openssh/default.nix b/system-profiles/openssh/default.nix
index a047a21d..cc4ecdf0 100644
--- a/system-profiles/openssh/default.nix
+++ b/system-profiles/openssh/default.nix
@@ -11,7 +11,7 @@ in {
11 default = true; 11 default = true;
12 }; 12 };
13 }; 13 };
14 14
15 config = { 15 config = {
16 systemd.user.services."ssh-agent".enable = mkForce false; # ssh-agent should be done via home-manager 16 systemd.user.services."ssh-agent".enable = mkForce false; # ssh-agent should be done via home-manager
17 17