Unverified Commit 0683f22a authored by Will Fancher's avatar Will Fancher Committed by GitHub
Browse files

Merge pull request #215179 from ElvishJerricco/initrd-sshd-settings-fix 

Initrd sshd settings fix
parents 96b00e56 eec74032

nixos/doc/manual/from_md/release-notes/rl-2305.section.xml

+2 −2
Original line number Diff line number Diff line
@@ -577,8 +577,8 @@ 
          </listitem>

          <listitem>

            <para>

              <literal>services.openssh.cyphers</literal> to

              <literal>services.openssh.settings.Cyphers</literal>

              <literal>services.openssh.ciphers</literal> to

              <literal>services.openssh.settings.Ciphers</literal>

            </para>

          </listitem>

          <listitem>

nixos/doc/manual/release-notes/rl-2305.section.md

+1 −1
Original line number Diff line number Diff line
@@ -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.

nixos/modules/services/networking/ssh/sshd.nix

+1 −1
Original line number Diff line number Diff line
@@ -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" ])

nixos/modules/system/boot/initrd-ssh.nix

+5 −5
Original line number Diff line number Diff line
@@ -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