nixos/*: fix indentation
This commit is contained in:
parent
bbcbaeb54d
commit
dbbd289982
@ -233,7 +233,7 @@ in
|
|||||||
type = types.str;
|
type = types.str;
|
||||||
default = "Check.Valid=1,Check.Unexpired=1";
|
default = "Check.Valid=1,Check.Unexpired=1";
|
||||||
description = ''
|
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
|
client certificates a server will accept, as a form of user
|
||||||
authorization; for example, it may only accept TLS clients who
|
authorization; for example, it may only accept TLS clients who
|
||||||
offer a certificate abiding by some locality or organization name.
|
offer a certificate abiding by some locality or organization name.
|
||||||
|
@ -408,7 +408,7 @@ in
|
|||||||
};
|
};
|
||||||
imports = [
|
imports = [
|
||||||
(mkRemovedOptionModule [ "services" "rspamd" "socketActivation" ]
|
(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" "bindSocket" ] [ "services" "rspamd" "workers" "normal" "bindSockets" ])
|
||||||
(mkRenamedOptionModule [ "services" "rspamd" "bindUISocket" ] [ "services" "rspamd" "workers" "controller" "bindSockets" ])
|
(mkRenamedOptionModule [ "services" "rspamd" "bindUISocket" ] [ "services" "rspamd" "workers" "controller" "bindSockets" ])
|
||||||
(mkRemovedOptionModule [ "services" "rmilter" ] "Use services.rspamd.* instead to set up milter service")
|
(mkRemovedOptionModule [ "services" "rmilter" ] "Use services.rspamd.* instead to set up milter service")
|
||||||
|
@ -39,7 +39,7 @@ in
|
|||||||
default = false;
|
default = false;
|
||||||
description = ''
|
description = ''
|
||||||
Whether to enable the Siproxd SIP
|
Whether to enable the Siproxd SIP
|
||||||
proxy/masquerading daemon.
|
proxy/masquerading daemon.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -57,29 +57,29 @@ in
|
|||||||
|
|
||||||
hostsAllowReg = mkOption {
|
hostsAllowReg = mkOption {
|
||||||
type = types.listOf types.str;
|
type = types.listOf types.str;
|
||||||
default = [ ];
|
default = [ ];
|
||||||
example = [ "192.168.1.0/24" "192.168.2.0/24" ];
|
example = [ "192.168.1.0/24" "192.168.2.0/24" ];
|
||||||
description = ''
|
description = ''
|
||||||
Acess control list for incoming SIP registrations.
|
Acess control list for incoming SIP registrations.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
hostsAllowSip = mkOption {
|
hostsAllowSip = mkOption {
|
||||||
type = types.listOf types.str;
|
type = types.listOf types.str;
|
||||||
default = [ ];
|
default = [ ];
|
||||||
example = [ "123.45.0.0/16" "123.46.0.0/16" ];
|
example = [ "123.45.0.0/16" "123.46.0.0/16" ];
|
||||||
description = ''
|
description = ''
|
||||||
Acess control list for incoming SIP traffic.
|
Acess control list for incoming SIP traffic.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
hostsDenySip = mkOption {
|
hostsDenySip = mkOption {
|
||||||
type = types.listOf types.str;
|
type = types.listOf types.str;
|
||||||
default = [ ];
|
default = [ ];
|
||||||
example = [ "10.0.0.0/8" "11.0.0.0/8" ];
|
example = [ "10.0.0.0/8" "11.0.0.0/8" ];
|
||||||
description = ''
|
description = ''
|
||||||
Acess control list for denying incoming
|
Acess control list for denying incoming
|
||||||
SIP registrations and traffic.
|
SIP registrations and traffic.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -87,7 +87,7 @@ in
|
|||||||
type = types.int;
|
type = types.int;
|
||||||
default = 5060;
|
default = 5060;
|
||||||
description = ''
|
description = ''
|
||||||
Port to listen for incoming SIP messages.
|
Port to listen for incoming SIP messages.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ in
|
|||||||
|
|
||||||
svnBaseDir = mkOption {
|
svnBaseDir = mkOption {
|
||||||
default = "/repos";
|
default = "/repos";
|
||||||
description = "Base directory from which Subversion repositories are accessed.";
|
description = "Base directory from which Subversion repositories are accessed.";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -108,10 +108,10 @@ in
|
|||||||
|
|
||||||
extmap = mkOption {
|
extmap = mkOption {
|
||||||
type = types.lines;
|
type = types.lines;
|
||||||
default = "";
|
default = "";
|
||||||
description = ''
|
description = ''
|
||||||
File name extension mappings.
|
File name extension mappings.
|
||||||
See <literal>man extmap.conf</literal> for more information.
|
See <literal>man extmap.conf</literal> for more information.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -132,10 +132,10 @@ in
|
|||||||
Type = "forking";
|
Type = "forking";
|
||||||
GuessMainPID = "no";
|
GuessMainPID = "no";
|
||||||
PIDFile = "/run/lock/netatalk";
|
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}";
|
ExecStart = "${pkgs.netatalk}/sbin/netatalk -F ${afpConfFile}";
|
||||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||||
ExecStop = "${pkgs.coreutils}/bin/kill -TERM $MAINPID";
|
ExecStop = "${pkgs.coreutils}/bin/kill -TERM $MAINPID";
|
||||||
Restart = "always";
|
Restart = "always";
|
||||||
RestartSec = 1;
|
RestartSec = 1;
|
||||||
};
|
};
|
||||||
|
@ -29,9 +29,11 @@ in
|
|||||||
key = mkOption {
|
key = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = "";
|
default = "";
|
||||||
description = "HMAC url validation key (hexadecimal encoded).
|
description = ''
|
||||||
Leave blank to disable. Without validation key, anyone can
|
HMAC url validation key (hexadecimal encoded).
|
||||||
submit proxy requests. Leave blank to disable.";
|
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";
|
defaultText = "No HMAC url validation. Generate with echo -n somevalue | openssl dgst -sha1 -hmac somekey";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -85,10 +87,10 @@ in
|
|||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
User = "morty";
|
User = "morty";
|
||||||
ExecStart = ''${cfg.package}/bin/morty \
|
ExecStart = ''${cfg.package}/bin/morty \
|
||||||
-listen ${cfg.listenAddress}:${toString cfg.port} \
|
-listen ${cfg.listenAddress}:${toString cfg.port} \
|
||||||
${optionalString cfg.ipv6 "-ipv6"} \
|
${optionalString cfg.ipv6 "-ipv6"} \
|
||||||
${optionalString (cfg.key != "") "-key " + cfg.key} \
|
${optionalString (cfg.key != "") "-key " + cfg.key} \
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
environment.systemPackages = [ cfg.package ];
|
environment.systemPackages = [ cfg.package ];
|
||||||
|
@ -1173,20 +1173,20 @@ in {
|
|||||||
|
|
||||||
ppk = mkPrefixedAttrsOfParams {
|
ppk = mkPrefixedAttrsOfParams {
|
||||||
secret = mkOptionalStrParam ''
|
secret = mkOptionalStrParam ''
|
||||||
Value of the PPK. It may either be an ASCII string, a hex encoded string
|
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
|
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
|
it has a <literal>0s</literal> prefix in its value. Should have at least
|
||||||
256 bits of entropy for 128-bit security.
|
256 bits of entropy for 128-bit security.
|
||||||
'';
|
'';
|
||||||
|
|
||||||
id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") ''
|
id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") ''
|
||||||
PPK identity the PPK belongs to. Multiple unique identities may be
|
PPK identity the PPK belongs to. Multiple unique identities may be
|
||||||
specified, each having an <literal>id</literal> prefix, if a secret is
|
specified, each having an <literal>id</literal> prefix, if a secret is
|
||||||
shared between multiple peers.
|
shared between multiple peers.
|
||||||
'';
|
'';
|
||||||
} ''
|
} ''
|
||||||
Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is
|
Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is
|
||||||
defined in a unique section having the <literal>ppk</literal> prefix.
|
defined in a unique section having the <literal>ppk</literal> prefix.
|
||||||
'';
|
'';
|
||||||
|
|
||||||
private = mkPrefixedAttrsOfParams {
|
private = mkPrefixedAttrsOfParams {
|
||||||
|
@ -21,7 +21,7 @@ let
|
|||||||
RegTestBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}";
|
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 {
|
in {
|
||||||
|
|
||||||
|
@ -448,7 +448,7 @@ in
|
|||||||
default = false;
|
default = false;
|
||||||
description = ''
|
description = ''
|
||||||
In case when running behind a reverse proxy, controls whether headers
|
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 will require this flag to be set to avoid logging the reverse
|
||||||
proxy IP address.
|
proxy IP address.
|
||||||
'';
|
'';
|
||||||
@ -524,7 +524,7 @@ in
|
|||||||
type = types.nullOr types.str;
|
type = types.nullOr types.str;
|
||||||
default = null;
|
default = null;
|
||||||
description = ''
|
description = ''
|
||||||
Profile access endpoint.
|
Profile access endpoint.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -16,8 +16,8 @@ in
|
|||||||
services.xserver.windowManager.session = singleton {
|
services.xserver.windowManager.session = singleton {
|
||||||
name = "evilwm";
|
name = "evilwm";
|
||||||
start = ''
|
start = ''
|
||||||
${pkgs.evilwm}/bin/evilwm &
|
${pkgs.evilwm}/bin/evilwm &
|
||||||
waitPID=$!
|
waitPID=$!
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
environment.systemPackages = [ pkgs.evilwm ];
|
environment.systemPackages = [ pkgs.evilwm ];
|
||||||
|
@ -614,17 +614,17 @@ in
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
timeoutStartSec = mkOption {
|
timeoutStartSec = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = "1min";
|
default = "1min";
|
||||||
description = ''
|
description = ''
|
||||||
Time for the container to start. In case of a timeout,
|
Time for the container to start. In case of a timeout,
|
||||||
the container processes get killed.
|
the container processes get killed.
|
||||||
See <citerefentry><refentrytitle>systemd.time</refentrytitle>
|
See <citerefentry><refentrytitle>systemd.time</refentrytitle>
|
||||||
<manvolnum>7</manvolnum></citerefentry>
|
<manvolnum>7</manvolnum></citerefentry>
|
||||||
for more information about the format.
|
for more information about the format.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
bindMounts = mkOption {
|
bindMounts = mkOption {
|
||||||
type = with types; attrsOf (submodule bindMountOpts);
|
type = with types; attrsOf (submodule bindMountOpts);
|
||||||
|
@ -12,9 +12,9 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||||||
{ ... }:
|
{ ... }:
|
||||||
{ services.morty = {
|
{ services.morty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
key = "78a9cd0cfee20c672f78427efb2a2a96036027f0";
|
key = "78a9cd0cfee20c672f78427efb2a2a96036027f0";
|
||||||
port = 3001;
|
port = 3001;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@ -55,7 +55,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||||||
parentHash =
|
parentHash =
|
||||||
"0x0000000000000000000000000000000000000000000000000000000000000000";
|
"0x0000000000000000000000000000000000000000000000000000000000000000";
|
||||||
timestamp = "0x5cffc201";
|
timestamp = "0x5cffc201";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -209,7 +209,7 @@ in
|
|||||||
return false
|
return false
|
||||||
end,
|
end,
|
||||||
score = 5.0,
|
score = 5.0,
|
||||||
description = 'Allow no cows',
|
description = 'Allow no cows',
|
||||||
group = "cows",
|
group = "cows",
|
||||||
}
|
}
|
||||||
rspamd_logger.infox(rspamd_config, 'Work dammit!!!')
|
rspamd_logger.infox(rspamd_config, 'Work dammit!!!')
|
||||||
|
Loading…
Reference in New Issue
Block a user