kookie
/
nomicon
1
0
Fork 0
Code Issues Projects Releases 1 Activity

nixos/*: fix indentation

Browse Source
wip/yesman
zowoq 4 years ago
parent bbcbaeb54d
commit dbbd289982
14 changed files with 57 additions and 55 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      nixos/modules/services/databases/foundationdb.nix
  2. 2
      nixos/modules/services/mail/rspamd.nix
  3. 18
      nixos/modules/services/misc/siproxd.nix
  4. 2
      nixos/modules/services/misc/svnserve.nix
  5. 12
      nixos/modules/services/network-filesystems/netatalk.nix
  6. 16
      nixos/modules/services/networking/morty.nix
  7. 18
      nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
  8. 2
      nixos/modules/services/networking/wasabibackend.nix
  9. 4
      nixos/modules/services/security/oauth2_proxy.nix
  10. 4
      nixos/modules/services/x11/window-managers/evilwm.nix
  11. 22
      nixos/modules/virtualisation/nixos-containers.nix
  12. 6
      nixos/tests/morty.nix
  13. 2
      nixos/tests/quorum.nix
  14. 2
      nixos/tests/rspamd.nix

2
nixos/modules/services/databases/foundationdb.nix
Unescape View File

@ -233,7 +233,7 @@ in
type = types.str;
default = "Check.Valid=1,Check.Unexpired=1";
description = ''
"Peer verification string". This may be used to adjust which TLS
"Peer verification string". This may be used to adjust which TLS
client certificates a server will accept, as a form of user
authorization; for example, it may only accept TLS clients who
offer a certificate abiding by some locality or organization name.

2
nixos/modules/services/mail/rspamd.nix
Unescape View File

@ -408,7 +408,7 @@ in
};
imports = [
(mkRemovedOptionModule [ "services" "rspamd" "socketActivation" ]
"Socket activation never worked correctly and could at this time not be fixed and so was removed")
"Socket activation never worked correctly and could at this time not be fixed and so was removed")
(mkRenamedOptionModule [ "services" "rspamd" "bindSocket" ] [ "services" "rspamd" "workers" "normal" "bindSockets" ])
(mkRenamedOptionModule [ "services" "rspamd" "bindUISocket" ] [ "services" "rspamd" "workers" "controller" "bindSockets" ])
(mkRemovedOptionModule [ "services" "rmilter" ] "Use services.rspamd.* instead to set up milter service")

18
nixos/modules/services/misc/siproxd.nix
Unescape View File

@ -39,7 +39,7 @@ in
default = false;
description = ''
Whether to enable the Siproxd SIP
proxy/masquerading daemon.
proxy/masquerading daemon.
'';
};
@ -57,29 +57,29 @@ in
hostsAllowReg = mkOption {
type = types.listOf types.str;
default = [ ];
default = [ ];
example = [ "192.168.1.0/24" "192.168.2.0/24" ];
description = ''
description = ''
Acess control list for incoming SIP registrations.
'';
};
hostsAllowSip = mkOption {
type = types.listOf types.str;
default = [ ];
default = [ ];
example = [ "123.45.0.0/16" "123.46.0.0/16" ];
description = ''
description = ''
Acess control list for incoming SIP traffic.
'';
};
hostsDenySip = mkOption {
type = types.listOf types.str;
default = [ ];
default = [ ];
example = [ "10.0.0.0/8" "11.0.0.0/8" ];
description = ''
description = ''
Acess control list for denying incoming
SIP registrations and traffic.
SIP registrations and traffic.
'';
};
@ -87,7 +87,7 @@ in
type = types.int;
default = 5060;
description = ''
Port to listen for incoming SIP messages.
Port to listen for incoming SIP messages.
'';
};

2
nixos/modules/services/misc/svnserve.nix
Unescape View File

@ -25,7 +25,7 @@ in
svnBaseDir = mkOption {
default = "/repos";
description = "Base directory from which Subversion repositories are accessed.";
description = "Base directory from which Subversion repositories are accessed.";
};
};

12
nixos/modules/services/network-filesystems/netatalk.nix
Unescape View File

@ -108,10 +108,10 @@ in
extmap = mkOption {
type = types.lines;
default = "";
description = ''
File name extension mappings.
See <literal>man extmap.conf</literal> for more information.
default = "";
description = ''
File name extension mappings.
See <literal>man extmap.conf</literal> for more information.
'';
};
@ -132,10 +132,10 @@ in
Type = "forking";
GuessMainPID = "no";
PIDFile = "/run/lock/netatalk";
ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0755 -p /var/lib/netatalk/CNID";
ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0755 -p /var/lib/netatalk/CNID";
ExecStart = "${pkgs.netatalk}/sbin/netatalk -F ${afpConfFile}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
ExecStop = "${pkgs.coreutils}/bin/kill -TERM $MAINPID";
ExecStop = "${pkgs.coreutils}/bin/kill -TERM $MAINPID";
Restart = "always";
RestartSec = 1;
};

16
nixos/modules/services/networking/morty.nix
Unescape View File

@ -29,9 +29,11 @@ in
key = mkOption {
type = types.str;
default = "";
description = "HMAC url validation key (hexadecimal encoded).
Leave blank to disable. Without validation key, anyone can
submit proxy requests. Leave blank to disable.";
description = ''
HMAC url validation key (hexadecimal encoded).
Leave blank to disable. Without validation key, anyone can
submit proxy requests. Leave blank to disable.
'';
defaultText = "No HMAC url validation. Generate with echo -n somevalue | openssl dgst -sha1 -hmac somekey";
};
@ -85,10 +87,10 @@ in
serviceConfig = {
User = "morty";
ExecStart = ''${cfg.package}/bin/morty \
-listen ${cfg.listenAddress}:${toString cfg.port} \
${optionalString cfg.ipv6 "-ipv6"} \
${optionalString (cfg.key != "") "-key " + cfg.key} \
'';
-listen ${cfg.listenAddress}:${toString cfg.port} \
${optionalString cfg.ipv6 "-ipv6"} \
${optionalString (cfg.key != "") "-key " + cfg.key} \
'';
};
};
environment.systemPackages = [ cfg.package ];

18
nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
Unescape View File

@ -1173,20 +1173,20 @@ in {
ppk = mkPrefixedAttrsOfParams {
secret = mkOptionalStrParam ''
Value of the PPK. It may either be an ASCII string, a hex encoded string
if it has a <literal>0x</literal> prefix or a Base64 encoded string if
it has a <literal>0s</literal> prefix in its value. Should have at least
256 bits of entropy for 128-bit security.
Value of the PPK. It may either be an ASCII string, a hex encoded string
if it has a <literal>0x</literal> prefix or a Base64 encoded string if
it has a <literal>0s</literal> prefix in its value. Should have at least
256 bits of entropy for 128-bit security.
'';
id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") ''
PPK identity the PPK belongs to. Multiple unique identities may be
specified, each having an <literal>id</literal> prefix, if a secret is
shared between multiple peers.
PPK identity the PPK belongs to. Multiple unique identities may be
specified, each having an <literal>id</literal> prefix, if a secret is
shared between multiple peers.
'';
} ''
Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is
defined in a unique section having the <literal>ppk</literal> prefix.
Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is
defined in a unique section having the <literal>ppk</literal> prefix.
'';
private = mkPrefixedAttrsOfParams {

2
nixos/modules/services/networking/wasabibackend.nix
Unescape View File

@ -21,7 +21,7 @@ let
RegTestBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}";
};
configFile = pkgs.writeText "wasabibackend.conf" (builtins.toJSON confOptions);
configFile = pkgs.writeText "wasabibackend.conf" (builtins.toJSON confOptions);
in {

4
nixos/modules/services/security/oauth2_proxy.nix
Unescape View File

@ -448,7 +448,7 @@ in
default = false;
description = ''
In case when running behind a reverse proxy, controls whether headers
like <literal>X-Real-Ip</literal> are accepted. Usage behind a reverse
like <literal>X-Real-Ip</literal> are accepted. Usage behind a reverse
proxy will require this flag to be set to avoid logging the reverse
proxy IP address.
'';
@ -524,7 +524,7 @@ in
type = types.nullOr types.str;
default = null;
description = ''
Profile access endpoint.
Profile access endpoint.
'';
};

4
nixos/modules/services/x11/window-managers/evilwm.nix
Unescape View File

@ -16,8 +16,8 @@ in
services.xserver.windowManager.session = singleton {
name = "evilwm";
start = ''
${pkgs.evilwm}/bin/evilwm &
waitPID=$!
${pkgs.evilwm}/bin/evilwm &
waitPID=$!
'';
};
environment.systemPackages = [ pkgs.evilwm ];

22
nixos/modules/virtualisation/nixos-containers.nix
Unescape View File

@ -614,17 +614,17 @@ in
'';
};
timeoutStartSec = mkOption {
type = types.str;
default = "1min";
description = ''
Time for the container to start. In case of a timeout,
the container processes get killed.
See <citerefentry><refentrytitle>systemd.time</refentrytitle>
<manvolnum>7</manvolnum></citerefentry>
for more information about the format.
'';
};
timeoutStartSec = mkOption {
type = types.str;
default = "1min";
description = ''
Time for the container to start. In case of a timeout,
the container processes get killed.
See <citerefentry><refentrytitle>systemd.time</refentrytitle>
<manvolnum>7</manvolnum></citerefentry>
for more information about the format.
'';
};
bindMounts = mkOption {
type = with types; attrsOf (submodule bindMountOpts);

6
nixos/tests/morty.nix
Unescape View File

@ -12,9 +12,9 @@ import ./make-test-python.nix ({ pkgs, ... }:
{ ... }:
{ services.morty = {
enable = true;
key = "78a9cd0cfee20c672f78427efb2a2a96036027f0";
port = 3001;
};
key = "78a9cd0cfee20c672f78427efb2a2a96036027f0";
port = 3001;
};
};
};

2
nixos/tests/quorum.nix
Unescape View File

@ -55,7 +55,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
parentHash =
"0x0000000000000000000000000000000000000000000000000000000000000000";
timestamp = "0x5cffc201";
};
};
};
};
};

2
nixos/tests/rspamd.nix
Unescape View File

@ -209,7 +209,7 @@ in
return false
end,
score = 5.0,
description = 'Allow no cows',
description = 'Allow no cows',
group = "cows",
}
rspamd_logger.infox(rspamd_config, 'Work dammit!!!')

Write Preview
Loading…
Cancel
Save