git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/*: fix indentation
commitdbbd289982ba87aea30453b1e6fb37f33e6bdb72 authorzowoq <59103226+zowoq@users.noreply.github.com> dateSun 22 Nov 2020, 17:23 (6 years ago) parentbbcbaeb
14 files changed+57−55
nixos/modules/services/databases/foundationdb.nix+1−1 nixos/modules/services/mail/rspamd.nix+1−1 nixos/modules/services/misc/siproxd.nix+9−9 nixos/modules/services/misc/svnserve.nix+1−1 nixos/modules/services/network-filesystems/netatalk.nix+6−6 nixos/modules/services/networking/morty.nix+9−7 nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix+9−9 nixos/modules/services/networking/wasabibackend.nix+1−1 nixos/modules/services/security/oauth2_proxy.nix+2−2 nixos/modules/services/x11/window-managers/evilwm.nix+2−2 nixos/modules/virtualisation/nixos-containers.nix+11−11 nixos/tests/morty.nix+3−3 nixos/tests/quorum.nix+1−1 nixos/tests/rspamd.nix+1−1
nixos/modules/services/databases/foundationdb.nix+1−1
@@ -233,7 +233,7 @@ in
233233 type = types.str;
234234 default = "Check.Valid=1,Check.Unexpired=1";
235235 description = ''
236− "Peer verification string". This may be used to adjust which TLS
236+ "Peer verification string". This may be used to adjust which TLS
237237 client certificates a server will accept, as a form of user
238238 authorization; for example, it may only accept TLS clients who
239239 offer a certificate abiding by some locality or organization name.
nixos/modules/services/mail/rspamd.nix+1−1
@@ -408,7 +408,7 @@ in
408408 };
409409 imports = [
410410 (mkRemovedOptionModule [ "services" "rspamd" "socketActivation" ]
411− "Socket activation never worked correctly and could at this time not be fixed and so was removed")
411+ "Socket activation never worked correctly and could at this time not be fixed and so was removed")
412412 (mkRenamedOptionModule [ "services" "rspamd" "bindSocket" ] [ "services" "rspamd" "workers" "normal" "bindSockets" ])
413413 (mkRenamedOptionModule [ "services" "rspamd" "bindUISocket" ] [ "services" "rspamd" "workers" "controller" "bindSockets" ])
414414 (mkRemovedOptionModule [ "services" "rmilter" ] "Use services.rspamd.* instead to set up milter service")
nixos/modules/services/misc/siproxd.nix+9−9
@@ -39,7 +39,7 @@ in
3939 default = false;
4040 description = ''
4141 Whether to enable the Siproxd SIP
42− proxy/masquerading daemon.
42+ proxy/masquerading daemon.
4343 '';
4444 };
4545
@@ -57,29 +57,29 @@ in
5757
5858 hostsAllowReg = mkOption {
5959 type = types.listOf types.str;
60− default = [ ];
60+ default = [ ];
6161 example = [ "192.168.1.0/24" "192.168.2.0/24" ];
62− description = ''
62+ description = ''
6363 Acess control list for incoming SIP registrations.
6464 '';
6565 };
6666
6767 hostsAllowSip = mkOption {
6868 type = types.listOf types.str;
69− default = [ ];
69+ default = [ ];
7070 example = [ "123.45.0.0/16" "123.46.0.0/16" ];
71− description = ''
71+ description = ''
7272 Acess control list for incoming SIP traffic.
7373 '';
7474 };
7575
7676 hostsDenySip = mkOption {
7777 type = types.listOf types.str;
78− default = [ ];
78+ default = [ ];
7979 example = [ "10.0.0.0/8" "11.0.0.0/8" ];
80− description = ''
80+ description = ''
8181 Acess control list for denying incoming
82− SIP registrations and traffic.
82+ SIP registrations and traffic.
8383 '';
8484 };
8585
@@ -87,7 +87,7 @@ in
8787 type = types.int;
8888 default = 5060;
8989 description = ''
90− Port to listen for incoming SIP messages.
90+ Port to listen for incoming SIP messages.
9191 '';
9292 };
9393
nixos/modules/services/misc/svnserve.nix+1−1
@@ -25,7 +25,7 @@ in
2525
2626 svnBaseDir = mkOption {
2727 default = "/repos";
28− description = "Base directory from which Subversion repositories are accessed.";
28+ description = "Base directory from which Subversion repositories are accessed.";
2929 };
3030 };
3131
nixos/modules/services/network-filesystems/netatalk.nix+6−6
@@ -108,10 +108,10 @@ in
108108
109109 extmap = mkOption {
110110 type = types.lines;
111− default = "";
112− description = ''
113− File name extension mappings.
114− See <literal>man extmap.conf</literal> for more information.
111+ default = "";
112+ description = ''
113+ File name extension mappings.
114+ See <literal>man extmap.conf</literal> for more information.
115115 '';
116116 };
117117
@@ -132,10 +132,10 @@ in
132132 Type = "forking";
133133 GuessMainPID = "no";
134134 PIDFile = "/run/lock/netatalk";
135− ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0755 -p /var/lib/netatalk/CNID";
135+ ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0755 -p /var/lib/netatalk/CNID";
136136 ExecStart = "${pkgs.netatalk}/sbin/netatalk -F ${afpConfFile}";
137137 ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
138− ExecStop = "${pkgs.coreutils}/bin/kill -TERM $MAINPID";
138+ ExecStop = "${pkgs.coreutils}/bin/kill -TERM $MAINPID";
139139 Restart = "always";
140140 RestartSec = 1;
141141 };
nixos/modules/services/networking/morty.nix+9−7
@@ -29,9 +29,11 @@ in
2929 key = mkOption {
3030 type = types.str;
3131 default = "";
32− description = "HMAC url validation key (hexadecimal encoded).
33− Leave blank to disable. Without validation key, anyone can
34− submit proxy requests. Leave blank to disable.";
32+ description = ''
33+ HMAC url validation key (hexadecimal encoded).
34+ Leave blank to disable. Without validation key, anyone can
35+ submit proxy requests. Leave blank to disable.
36+ '';
3537 defaultText = "No HMAC url validation. Generate with echo -n somevalue | openssl dgst -sha1 -hmac somekey";
3638 };
3739
@@ -85,10 +87,10 @@ in
8587 serviceConfig = {
8688 User = "morty";
8789 ExecStart = ''${cfg.package}/bin/morty \
88− -listen ${cfg.listenAddress}:${toString cfg.port} \
89− ${optionalString cfg.ipv6 "-ipv6"} \
90− ${optionalString (cfg.key != "") "-key " + cfg.key} \
91− '';
90+ -listen ${cfg.listenAddress}:${toString cfg.port} \
91+ ${optionalString cfg.ipv6 "-ipv6"} \
92+ ${optionalString (cfg.key != "") "-key " + cfg.key} \
93+ '';
9294 };
9395 };
9496 environment.systemPackages = [ cfg.package ];
nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix+9−9
@@ -1173,20 +1173,20 @@ in {
11731173
11741174 ppk = mkPrefixedAttrsOfParams {
11751175 secret = mkOptionalStrParam ''
1176− Value of the PPK. It may either be an ASCII string, a hex encoded string
1177− if it has a <literal>0x</literal> prefix or a Base64 encoded string if
1178− it has a <literal>0s</literal> prefix in its value. Should have at least
1179− 256 bits of entropy for 128-bit security.
1176+ Value of the PPK. It may either be an ASCII string, a hex encoded string
1177+ if it has a <literal>0x</literal> prefix or a Base64 encoded string if
1178+ it has a <literal>0s</literal> prefix in its value. Should have at least
1179+ 256 bits of entropy for 128-bit security.
11801180 '';
11811181
11821182 id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") ''
1183− PPK identity the PPK belongs to. Multiple unique identities may be
1184− specified, each having an <literal>id</literal> prefix, if a secret is
1185− shared between multiple peers.
1183+ PPK identity the PPK belongs to. Multiple unique identities may be
1184+ specified, each having an <literal>id</literal> prefix, if a secret is
1185+ shared between multiple peers.
11861186 '';
11871187 } ''
1188− Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is
1189− defined in a unique section having the <literal>ppk</literal> prefix.
1188+ Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is
1189+ defined in a unique section having the <literal>ppk</literal> prefix.
11901190 '';
11911191
11921192 private = mkPrefixedAttrsOfParams {
nixos/modules/services/networking/wasabibackend.nix+1−1
@@ -21,7 +21,7 @@ let
2121 RegTestBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}";
2222 };
2323
24− configFile = pkgs.writeText "wasabibackend.conf" (builtins.toJSON confOptions);
24+ configFile = pkgs.writeText "wasabibackend.conf" (builtins.toJSON confOptions);
2525
2626in {
2727
nixos/modules/services/security/oauth2_proxy.nix+2−2
@@ -448,7 +448,7 @@ in
448448 default = false;
449449 description = ''
450450 In case when running behind a reverse proxy, controls whether headers
451− like <literal>X-Real-Ip</literal> are accepted. Usage behind a reverse
451+ like <literal>X-Real-Ip</literal> are accepted. Usage behind a reverse
452452 proxy will require this flag to be set to avoid logging the reverse
453453 proxy IP address.
454454 '';
@@ -524,7 +524,7 @@ in
524524 type = types.nullOr types.str;
525525 default = null;
526526 description = ''
527− Profile access endpoint.
527+ Profile access endpoint.
528528 '';
529529 };
530530
nixos/modules/services/x11/window-managers/evilwm.nix+2−2
@@ -16,8 +16,8 @@ in
1616 services.xserver.windowManager.session = singleton {
1717 name = "evilwm";
1818 start = ''
19− ${pkgs.evilwm}/bin/evilwm &
20− waitPID=$!
19+ ${pkgs.evilwm}/bin/evilwm &
20+ waitPID=$!
2121 '';
2222 };
2323 environment.systemPackages = [ pkgs.evilwm ];
nixos/modules/virtualisation/nixos-containers.nix+11−11
@@ -614,17 +614,17 @@ in
614614 '';
615615 };
616616
617− timeoutStartSec = mkOption {
618− type = types.str;
619− default = "1min";
620− description = ''
621− Time for the container to start. In case of a timeout,
622− the container processes get killed.
623− See <citerefentry><refentrytitle>systemd.time</refentrytitle>
624− <manvolnum>7</manvolnum></citerefentry>
625− for more information about the format.
626− '';
627− };
617+ timeoutStartSec = mkOption {
618+ type = types.str;
619+ default = "1min";
620+ description = ''
621+ Time for the container to start. In case of a timeout,
622+ the container processes get killed.
623+ See <citerefentry><refentrytitle>systemd.time</refentrytitle>
624+ <manvolnum>7</manvolnum></citerefentry>
625+ for more information about the format.
626+ '';
627+ };
628628
629629 bindMounts = mkOption {
630630 type = with types; attrsOf (submodule bindMountOpts);
nixos/tests/morty.nix+3−3
@@ -12,9 +12,9 @@ import ./make-test-python.nix ({ pkgs, ... }:
1212 { ... }:
1313 { services.morty = {
1414 enable = true;
15− key = "78a9cd0cfee20c672f78427efb2a2a96036027f0";
16− port = 3001;
17− };
15+ key = "78a9cd0cfee20c672f78427efb2a2a96036027f0";
16+ port = 3001;
17+ };
1818 };
1919
2020 };
nixos/tests/quorum.nix+1−1
@@ -55,7 +55,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
5555 parentHash =
5656 "0x0000000000000000000000000000000000000000000000000000000000000000";
5757 timestamp = "0x5cffc201";
58− };
58+ };
5959 };
6060 };
6161 };
nixos/tests/rspamd.nix+1−1
@@ -209,7 +209,7 @@ in
209209 return false
210210 end,
211211 score = 5.0,
212− description = 'Allow no cows',
212+ description = 'Allow no cows',
213213 group = "cows",
214214 }
215215 rspamd_logger.infox(rspamd_config, 'Work dammit!!!')