Merge branch 'master' into staging

2016-02-07 13:52:42 +01:00
parent 234f461139 98ffc61e2f
commit a115bff08c
514 changed files with 24027 additions and 15228 deletions
@@ -186,6 +186,9 @@ in

        ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}

+        # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
+        PubkeyAcceptedKeyTypes +ssh-dss
+
        ${cfg.extraConfig}
      '';