From 1406dd02a9e00cf8d5ca755f29d1090a045c17a3 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 7 Feb 2023 13:53:02 -0500 Subject: [PATCH 1/2] sshd: Cyphers -> Ciphers --- nixos/doc/manual/from_md/release-notes/rl-2305.section.xml | 4 ++-- nixos/doc/manual/release-notes/rl-2305.section.md | 2 +- nixos/modules/services/networking/ssh/sshd.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index e0931abe3419..b4041c026129 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -577,8 +577,8 @@ - services.openssh.cyphers to - services.openssh.settings.Cyphers + services.openssh.ciphers to + services.openssh.settings.Ciphers diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 9cf429847147..305458c66546 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -137,7 +137,7 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.openssh.logLevel` to `services.openssh.settings.LogLevel` - `services.openssh.kexAlgorithms` to `services.openssh.settings.KexAlgorithms` - `services.openssh.macs` to `services.openssh.settings.Macs` - - `services.openssh.cyphers` to `services.openssh.settings.Cyphers` + - `services.openssh.ciphers` to `services.openssh.settings.Ciphers` - `services.openssh.gatewayPorts` to `services.openssh.settings.GatewayPorts` - `services.mastodon` gained a tootctl wrapped named `mastodon-tootctl` similar to `nextcloud-occ` which can be executed from any user and switches to the configured mastodon user with sudo and sources the environment variables. diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index b1a108be0cfa..095c7de0b7aa 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -106,7 +106,7 @@ in (mkRenamedOptionModule [ "services" "openssh" "permitRootLogin" ] [ "services" "openssh" "settings" "PermitRootLogin" ]) (mkRenamedOptionModule [ "services" "openssh" "logLevel" ] [ "services" "openssh" "settings" "LogLevel" ]) (mkRenamedOptionModule [ "services" "openssh" "macs" ] [ "services" "openssh" "settings" "Macs" ]) - (mkRenamedOptionModule [ "services" "openssh" "cyphers" ] [ "services" "openssh" "settings" "Cyphers" ]) + (mkRenamedOptionModule [ "services" "openssh" "ciphers" ] [ "services" "openssh" "settings" "Ciphers" ]) (mkRenamedOptionModule [ "services" "openssh" "kexAlgorithms" ] [ "services" "openssh" "settings" "KexAlgorithms" ]) (mkRenamedOptionModule [ "services" "openssh" "gatewayPorts" ] [ "services" "openssh" "settings" "GatewayPorts" ]) (mkRenamedOptionModule [ "services" "openssh" "forwardX11" ] [ "services" "openssh" "settings" "X11Forwarding" ]) From eec740325c942fc62d3e8d95c81244e867f1ecc5 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 7 Feb 2023 13:56:02 -0500 Subject: [PATCH 2/2] initrd-ssh: New sshd settings names --- nixos/modules/system/boot/initrd-ssh.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 701d242abc15..125f75d66706 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -128,13 +128,13 @@ in HostKey ${initrdKeyPath path} '')} - KexAlgorithms ${concatStringsSep "," sshdCfg.kexAlgorithms} - Ciphers ${concatStringsSep "," sshdCfg.ciphers} - MACs ${concatStringsSep "," sshdCfg.macs} + KexAlgorithms ${concatStringsSep "," sshdCfg.settings.KexAlgorithms} + Ciphers ${concatStringsSep "," sshdCfg.settings.Ciphers} + MACs ${concatStringsSep "," sshdCfg.settings.Macs} - LogLevel ${sshdCfg.logLevel} + LogLevel ${sshdCfg.settings.LogLevel} - ${if sshdCfg.useDns then '' + ${if sshdCfg.settings.UseDns then '' UseDNS yes '' else '' UseDNS no