1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 12:11:28 +00:00

Merge pull request #211992 from ncfavier/remove-stray-spaces

This commit is contained in:
Naïm Favier 2023-01-21 21:51:52 +01:00 committed by GitHub
commit 8bf63a5ed4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

View file

@ -28,7 +28,7 @@ in
host = mkOption {
type = types.str;
description = mdDoc "External host name";
defaultText = lib.literalExpression "config.networking.domain or config.networking.hostName ";
defaultText = lib.literalExpression "config.networking.domain or config.networking.hostName";
default =
if domain == null then
config.networking.hostName

View file

@ -86,7 +86,7 @@ in
banaction = mkOption {
default = if config.networking.nftables.enable then "nftables-multiport" else "iptables-multiport";
defaultText = literalExpression '' if config.networking.nftables.enable then "nftables-multiport" else "iptables-multiport" '';
defaultText = literalExpression ''if config.networking.nftables.enable then "nftables-multiport" else "iptables-multiport"'';
type = types.str;
description = lib.mdDoc ''
Default banning action (e.g. iptables, iptables-new, iptables-multiport,
@ -98,7 +98,7 @@ in
banaction-allports = mkOption {
default = if config.networking.nftables.enable then "nftables-allport" else "iptables-allport";
defaultText = literalExpression '' if config.networking.nftables.enable then "nftables-allport" else "iptables-allport" '';
defaultText = literalExpression ''if config.networking.nftables.enable then "nftables-allport" else "iptables-allport"'';
type = types.str;
description = lib.mdDoc ''
Default banning action (e.g. iptables, iptables-new, iptables-multiport,

View file

@ -144,7 +144,7 @@ in {
interface. If unset no authentication will be required.
The file must contain user names and password hashes in the format
`username:hash `, one for each line. Usernames must
`username:hash`, one for each line. Usernames must
start with a lowecase ([a-z]) ASCII character, might contain
non-consecutive underscores except at the end, and consists of
small-case a-z characters and digits 0-9.