movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-12-18 18:01:41 +00:00 • committed by GitHub
commit dc7ebb0163
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
308 changed files with 487 additions and 438 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/networking/3proxy.nix
View file

@ -158,7 +158,7 @@ in {
description = lib.mdDoc ''
List of target IP ranges, use empty list for any.
May also contain host names instead of addresses.
It's possible to use wildmask in the begginning and in the the end of hostname, e.g. `*badsite.com` or `*badcontent*`.
It's possible to use wildmask in the beginning and in the the end of hostname, e.g. `*badsite.com` or `*badcontent*`.
Hostname is only checked if hostname presents in request.
'';
};

4
nixos/modules/services/networking/biboumi.nix
View file

@ -45,7 +45,7 @@ in
default = "/etc/ssl/certs/ca-certificates.crt";
description = lib.mdDoc ''
Specifies which file should be used as the list of trusted CA
when negociating a TLS session.
when negotiating a TLS session.
'';
};
options.db_name = mkOption {
@ -111,7 +111,7 @@ in
description = lib.mdDoc ''
A directory that should contain the policy files,
used to customize Botan’s behaviour
when negociating the TLS connections with the IRC servers.
when negotiating the TLS connections with the IRC servers.
'';
};
options.port = mkOption {

2
nixos/modules/services/networking/bitcoind.nix
View file

@ -95,7 +95,7 @@ let
}
'';
type = types.attrsOf (types.submodule rpcUserOpts);
description = lib.mdDoc "RPC user information for JSON-RPC connnections.";
description = lib.mdDoc "RPC user information for JSON-RPC connections.";
};
};

2
nixos/modules/services/networking/bitlbee.nix
View file

@ -60,7 +60,7 @@ in
type = types.str;
default = "127.0.0.1";
description = lib.mdDoc ''
The interface the BitlBee deamon will be listening to. If `127.0.0.1`,
The interface the BitlBee daemon will be listening to. If `127.0.0.1`,
only clients on the local host can connect to it; if `0.0.0.0`, clients
can access it from any network interface.
'';

2
nixos/modules/services/networking/consul.nix
View file

@ -142,7 +142,7 @@ in
};
consulAddr = mkOption {
description = lib.mdDoc "Consul api listening adddress";
description = lib.mdDoc "Consul api listening address";
default = "localhost:8500";
type = types.str;
};

2
nixos/modules/services/networking/epmd.nix
View file

@ -32,7 +32,7 @@ in
default = "[::]:4369";
description = lib.mdDoc ''
the listenStream used by the systemd socket.
see https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream= for more informations.
see https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream= for more information.
use this to change the port epmd will run on.
if not defined, epmd will use "[::]:4369"
'';

4
nixos/modules/services/networking/hans.nix
View file

@ -55,7 +55,7 @@ in
passwordFile = mkOption {
type = types.str;
default = "";
description = lib.mdDoc "File that containts password";
description = lib.mdDoc "File that contains password";
};
};
@ -92,7 +92,7 @@ in
passwordFile = mkOption {
type = types.str;
default = "";
description = lib.mdDoc "File that containts password";
description = lib.mdDoc "File that contains password";
};
};

4
nixos/modules/services/networking/headscale.nix
View file

@ -268,7 +268,7 @@ in
type = types.attrsOf types.str;
default = { };
description = lib.mdDoc ''
Domain map is used to map incomming users (by their email) to
Domain map is used to map incoming users (by their email) to
a namespace. The key can be a string, or regex.
'';
example = {
@ -326,7 +326,7 @@ in
type = types.nullOr types.path;
default = null;
description = lib.mdDoc ''
Path to a file containg ACL policies.
Path to a file containing ACL policies.
'';
};

2
nixos/modules/services/networking/hylafax/systemd.nix
View file

@ -96,7 +96,7 @@ let
hardenService =
# Add some common systemd service hardening settings,
# but allow each service (here) to override
# settings by explicitely setting those to `null`.
# settings by explicitly setting those to `null`.
# More hardening would be nice but makes
# customizing hylafax setups very difficult.
# If at all, it should only be added along

2
nixos/modules/services/networking/i2pd.nix
View file

@ -473,7 +473,7 @@ in
type = with types; nullOr str;
default = null;
description = lib.mdDoc ''
Router Familiy to trust for first hops.
Router Family to trust for first hops.
'';
};

2
nixos/modules/services/networking/iperf3.nix
View file

@ -7,7 +7,7 @@ let
port = mkOption {
type = types.ints.u16;
default = 5201;
description = lib.mdDoc "Server port to listen on for iperf3 client requsts.";
description = lib.mdDoc "Server port to listen on for iperf3 client requests.";
};
affinity = mkOption {
type = types.nullOr types.ints.unsigned;

8
nixos/modules/services/networking/kea.nix
View file

@ -47,7 +47,7 @@ in
type = listOf str;
default = [];
description = lib.mdDoc ''
List of additonal arguments to pass to the daemon.
List of additional arguments to pass to the daemon.
'';
};
@ -86,7 +86,7 @@ in
type = listOf str;
default = [];
description = lib.mdDoc ''
List of additonal arguments to pass to the daemon.
List of additional arguments to pass to the daemon.
'';
};
@ -146,7 +146,7 @@ in
type = listOf str;
default = [];
description = lib.mdDoc ''
List of additonal arguments to pass to the daemon.
List of additional arguments to pass to the daemon.
'';
};
@ -207,7 +207,7 @@ in
type = listOf str;
default = [];
description = lib.mdDoc ''
List of additonal arguments to pass to the daemon.
List of additional arguments to pass to the daemon.
'';
};

2
nixos/modules/services/networking/knot.nix
View file

@ -43,7 +43,7 @@ in {
type = types.listOf types.str;
default = [];
description = lib.mdDoc ''
List of additional command line paramters for knotd
List of additional command line parameters for knotd
'';
};

2
nixos/modules/services/networking/libreswan.nix
View file

@ -106,7 +106,7 @@ in
type = types.bool;
default = true;
description = lib.mdDoc ''
Whether to disable send and accept redirects for all nework interfaces.
Whether to disable send and accept redirects for all network interfaces.
See the Libreswan [
FAQ](https://libreswan.org/wiki/FAQ#Why_is_it_recommended_to_disable_send_redirects_in_.2Fproc.2Fsys.2Fnet_.3F) page for why this is recommended.
'';

2
nixos/modules/services/networking/lxd-image-server.nix
View file

@ -87,7 +87,7 @@ in
};
};
})
# this is seperate so it can be enabled on mirrored hosts
# this is separate so it can be enabled on mirrored hosts
(mkIf (cfg.nginx.enable) {
# https://github.com/Avature/lxd-image-server/blob/master/resources/nginx/includes/lxd-image-server.pkg.conf
services.nginx.virtualHosts = {

2
nixos/modules/services/networking/mosquitto.nix
View file

@ -479,7 +479,7 @@ let
Directories to be scanned for further config files to include.
Directories will processed in the order given,
`*.conf` files in the directory will be
read in case-sensistive alphabetical order.
read in case-sensitive alphabetical order.
'';
default = [];
};

2
nixos/modules/services/networking/ncdns.nix
View file

@ -85,7 +85,7 @@ in
```
bit. IN NS ns1.example.com.
```
If unset ncdns will generate an internal psuedo-hostname under the
If unset ncdns will generate an internal pseudo-hostname under the
zone, which will resolve to the value of
{option}`services.ncdns.identity.address`.
If you are only using ncdns locally you can ignore this.

4
nixos/modules/services/networking/ndppd.nix
View file

@ -43,7 +43,7 @@ let
timeout = mkOption {
type = types.int;
description = lib.mdDoc ''
Controls how long to wait for a Neighbor Advertisment Message before
Controls how long to wait for a Neighbor Advertisement Message before
invalidating the entry, in milliseconds.
'';
default = 500;
@ -74,7 +74,7 @@ let
type = types.nullOr types.str;
description = lib.mdDoc ''
This is the target address is to match against. If no netmask
is provided, /128 is assumed. The addresses of serveral rules
is provided, /128 is assumed. The addresses of several rules
may or may not overlap.
Defaults to the name of the attrset.
'';

2
nixos/modules/services/networking/nftables.nix
View file

@ -37,7 +37,7 @@ in
# Check out https://wiki.nftables.org/ for better documentation.
# Table for both IPv4 and IPv6.
table inet filter {
# Block all incomming connections traffic except SSH and "ping".
# Block all incoming connections traffic except SSH and "ping".
chain input {
type filter hook input priority 0;

2
nixos/modules/services/networking/nsd.nix
View file

@ -371,7 +371,7 @@ let
default = null;
example = "2000::1@1234";
description = lib.mdDoc ''
This address will be used for zone-transfere requests if configured
This address will be used for zone-transfer requests if configured
as a secondary server or notifications in case of a primary server.
Supply either a plain IPv4 or IPv6 address with an optional port
number (ip@port).

2
nixos/modules/services/networking/ostinato.nix
View file

@ -54,7 +54,7 @@ in
default = "0.0.0.0";
description = lib.mdDoc ''
By default, the Drone RPC server will listen on all interfaces and
local IPv4 adresses for incoming connections from clients. Specify
local IPv4 addresses for incoming connections from clients. Specify
a single IPv4 or IPv6 address if you want to restrict that.
To listen on any IPv6 address, use ::
'';

2
nixos/modules/services/networking/pleroma.nix
View file

@ -52,7 +52,7 @@ in {
the right place to store any secret
Have a look to Pleroma section in the NixOS manual for more
informations.
information.
'';
};

8
nixos/modules/services/networking/prosody.nix
View file

@ -309,7 +309,7 @@ let
type = types.int;
default = 300;
description = lib.mdDoc ''
Timout after which the room is destroyed or unlocked if not
Timeout after which the room is destroyed or unlocked if not
configured, in seconds
'';
};
@ -489,7 +489,7 @@ in
Setting this option to true will prevent you from building a
NixOS configuration which won't comply with this standard.
You can explicitely decide to ignore this standard if you
You can explicitly decide to ignore this standard if you
know what you are doing by setting this option to false.
[1] https://xmpp.org/extensions/xep-0423.html
@ -649,7 +649,7 @@ in
extraPluginPaths = mkOption {
type = types.listOf types.path;
default = [];
description = lib.mdDoc "Addtional path in which to look find plugins/modules";
description = lib.mdDoc "Additional path in which to look find plugins/modules";
};
uploadHttp = mkOption {
@ -733,7 +733,7 @@ in
Having a server not XEP-0423-compliant might make your XMPP
experience terrible. See the NixOS manual for further
informations.
information.
If you know what you're doing, you can disable this warning by
setting config.services.prosody.xmppComplianceSuite to false.

2
nixos/modules/services/networking/radicale.nix
View file

@ -77,7 +77,7 @@ in {
<https://radicale.org/3.0.html#documentation/authentication-and-rights>.
This option only works in conjunction with {option}`settings`.
Setting this will also set {option}`settings.rights.type` and
{option}`settings.rights.file` to approriate values.
{option}`settings.rights.file` to appropriate values.
'';
default = { };
example = literalExpression ''

4
nixos/modules/services/networking/searx.nix
View file

@ -124,7 +124,7 @@ in
description = lib.mdDoc ''
Whether to run searx in uWSGI as a "vassal", instead of using its
built-in HTTP server. This is the recommended mode for public or
large instances, but is unecessary for LAN or local-only use.
large instances, but is unnecessary for LAN or local-only use.
::: {.warning}
The built-in HTTP server logs all queries by default.
@ -223,7 +223,7 @@ in
module = "searx.webapp";
env = [
"SEARX_SETTINGS_PATH=${cfg.settingsFile}"
# searxng compatiblity https://github.com/searxng/searxng/issues/1519
# searxng compatibility https://github.com/searxng/searxng/issues/1519
"SEARXNG_SETTINGS_PATH=${cfg.settingsFile}"
];
buffer-size = 32768;

2
nixos/modules/services/networking/stunnel.nix
View file

@ -78,7 +78,7 @@ in
servers = mkOption {
description = lib.mdDoc ''
Define the server configuations.
Define the server configurations.
See "SERVICE-LEVEL OPTIONS" in {manpage}`stunnel(8)`.
'';

2
nixos/modules/services/networking/unbound.nix
View file

@ -245,7 +245,7 @@ in {
NotifyAccess = "main";
Type = "notify";
# FIXME: Which of these do we actualy need, can we drop the chroot flag?
# FIXME: Which of these do we actually need, can we drop the chroot flag?
AmbientCapabilities = [
"CAP_NET_BIND_SERVICE"
"CAP_NET_RAW"

2
nixos/modules/services/networking/unifi.nix
View file

@ -76,7 +76,7 @@ in
default = null;
example = 4096;
description = lib.mdDoc ''
Set the maximimum heap size for the JVM in MB. If this option isn't set, the
Set the maximum heap size for the JVM in MB. If this option isn't set, the
JVM will decide this value at runtime.
'';
};

2
nixos/modules/services/networking/vsftpd.nix
View file

@ -168,7 +168,7 @@ in
The default is a file containing the users from {option}`userlist`.
If explicitely set to null userlist_file will not be set in vsftpd's config file.
If explicitly set to null userlist_file will not be set in vsftpd's config file.
'';
};

2
nixos/modules/services/networking/wireguard.nix
View file

@ -303,7 +303,7 @@ let
set -e
# If the parent dir does not already exist, create it.
# Otherwise, does nothing, keeping existing permisions intact.
# Otherwise, does nothing, keeping existing permissions intact.
mkdir -p --mode 0755 "${dirOf values.privateKeyFile}"
if [ ! -f "${values.privateKeyFile}" ]; then

4
nixos/modules/services/networking/yggdrasil.xml
View file

@ -30,7 +30,7 @@ An annotated example of a simple configuration:
settings = {
Peers = [
# Yggdrasil will automatically connect and "peer" with other nodes it
# discovers via link-local multicast annoucements. Unless this is the
# discovers via link-local multicast announcements. Unless this is the
# case (it probably isn't) a node needs peers within the existing
# network that it can tunnel to.
"tcp://1.2.3.4:1024"
@ -78,7 +78,7 @@ in {
}];
services.radvd = {
# Annouce the 300::/8 prefix to eth0.
# Announce the 300::/8 prefix to eth0.
enable = true;
config = ''
interface eth0