Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sshd: add custom options #40692

Merged
merged 1 commit into from Jun 2, 2018
Merged

sshd: add custom options #40692

merged 1 commit into from Jun 2, 2018

Conversation

Izorkin
Copy link
Contributor

@Izorkin Izorkin commented May 17, 2018 •
edited

Motivation for this change

Add custom options - UseDNS and add change loglevel format

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

bjornfor
bjornfor reviewed May 17, 2018
View reviewed changes
nixos/modules/services/networking/ssh/sshd.nix Outdated
@@ -272,6 +272,28 @@ in
'';
};

logLevel = mkOption {
type = types.str;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the log levels are pretty stable,. Perhaps using types.enum is a good idea?

@Izorkin
Copy link
Contributor Author

Izorkin commented May 18, 2018

Fixed

dotlambda
dotlambda reviewed May 18, 2018
View reviewed changes
nixos/modules/services/networking/ssh/sshd.nix Outdated
default = "VERBOSE";
description = ''
Gives the verbosity level that is used when logging messages from sshd(8). The possible values are:
QUIET, FATAL, ERROR, INFO, VERBOSE, DEBUG, DEBUG1, DEBUG2, and DEBUG3. The default is INFO. DEBUG and DEBUG1
Copy link
Member

@dotlambda dotlambda May 18, 2018 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the default is INFO, why did you set default = "VERBOSE"? We can keep the previous default of VERBOSE but you'll have to update the description.

@Izorkin
Copy link
Contributor Author

Izorkin commented May 18, 2018

Update description

@matthewbauer matthewbauer merged commit 76d0d7c into NixOS:master Jun 2, 2018
@Izorkin Izorkin deleted the sshd branch June 2, 2018 05:52
@nh2 nh2 mentioned this pull request Oct 11, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjornfor bjornfor bjornfor left review comments

@dotlambda dotlambda dotlambda left review comments

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Izorkin @bjornfor @dotlambda @matthewbauer @GrahamcOfBorg