mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-11 04:05:40 +03:00
treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build a08b3a4d19.tar.gz \
--argstr baseRev b32a094368
result/bin/apply-formatting $NIXPKGS_PATH
This commit is contained in:
Silvan Mosberger
parent
b32a094368
commit
4f0dadbf38
21293 changed files with 701351 additions and 428307 deletions
|
|
@ -1,5 +1,11 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
let cfg = config.services.snapraid;
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.snapraid;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
|
|
@ -44,15 +50,18 @@ in
|
|||
};
|
||||
exclude = lib.mkOption {
|
||||
default = [ ];
|
||||
example = [ "*.unrecoverable" "/tmp/" "/lost+found/" ];
|
||||
example = [
|
||||
"*.unrecoverable"
|
||||
"/tmp/"
|
||||
"/lost+found/"
|
||||
];
|
||||
description = "SnapRAID exclude directives.";
|
||||
type = listOf str;
|
||||
};
|
||||
touchBeforeSync = lib.mkOption {
|
||||
default = true;
|
||||
example = false;
|
||||
description =
|
||||
"Whether {command}`snapraid touch` should be run before {command}`snapraid sync`.";
|
||||
description = "Whether {command}`snapraid touch` should be run before {command}`snapraid sync`.";
|
||||
type = bool;
|
||||
};
|
||||
sync.interval = lib.mkOption {
|
||||
|
|
@ -71,15 +80,13 @@ in
|
|||
plan = lib.mkOption {
|
||||
default = 8;
|
||||
example = 5;
|
||||
description =
|
||||
"Percent of the array that should be checked by {command}`snapraid scrub`.";
|
||||
description = "Percent of the array that should be checked by {command}`snapraid scrub`.";
|
||||
type = int;
|
||||
};
|
||||
olderThan = lib.mkOption {
|
||||
default = 10;
|
||||
example = 20;
|
||||
description =
|
||||
"Number of days since data was last scrubbed before it can be scrubbed again.";
|
||||
description = "Number of days since data was last scrubbed before it can be scrubbed again.";
|
||||
type = int;
|
||||
};
|
||||
};
|
||||
|
|
@ -110,8 +117,7 @@ in
|
|||
}
|
||||
{
|
||||
assertion = builtins.length cfg.contentFiles >= nParity + 1;
|
||||
message =
|
||||
"There must be at least one SnapRAID content file for each SnapRAID parity file plus one.";
|
||||
message = "There must be at least one SnapRAID content file for each SnapRAID parity file plus one.";
|
||||
}
|
||||
];
|
||||
|
||||
|
|
@ -119,19 +125,23 @@ in
|
|||
systemPackages = with pkgs; [ snapraid ];
|
||||
|
||||
etc."snapraid.conf" = {
|
||||
text = with cfg;
|
||||
text =
|
||||
with cfg;
|
||||
let
|
||||
prependData = mkPrepend "data ";
|
||||
prependContent = mkPrepend "content ";
|
||||
prependExclude = mkPrepend "exclude ";
|
||||
in
|
||||
lib.concatStringsSep "\n"
|
||||
(map prependData
|
||||
((lib.mapAttrsToList (name: value: name + " " + value)) dataDisks)
|
||||
++ lib.zipListsWith (a: b: a + b)
|
||||
([ "parity " ] ++ map (i: toString i + "-parity ") (lib.range 2 6))
|
||||
parityFiles ++ map prependContent contentFiles
|
||||
++ map prependExclude exclude) + "\n" + extraConfig;
|
||||
lib.concatStringsSep "\n" (
|
||||
map prependData ((lib.mapAttrsToList (name: value: name + " " + value)) dataDisks)
|
||||
++ lib.zipListsWith (a: b: a + b) (
|
||||
[ "parity " ] ++ map (i: toString i + "-parity ") (lib.range 2 6)
|
||||
) parityFiles
|
||||
++ map prependContent contentFiles
|
||||
++ map prependExclude exclude
|
||||
)
|
||||
+ "\n"
|
||||
+ extraConfig;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -141,9 +151,7 @@ in
|
|||
startAt = scrub.interval;
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStart = "${pkgs.snapraid}/bin/snapraid scrub -p ${
|
||||
toString scrub.plan
|
||||
} -o ${toString scrub.olderThan}";
|
||||
ExecStart = "${pkgs.snapraid}/bin/snapraid scrub -p ${toString scrub.plan} -o ${toString scrub.olderThan}";
|
||||
Nice = 19;
|
||||
IOSchedulingPriority = 7;
|
||||
CPUSchedulingPolicy = "batch";
|
||||
|
|
@ -176,60 +184,57 @@ in
|
|||
let
|
||||
contentDirs = map dirOf contentFiles;
|
||||
in
|
||||
lib.unique (
|
||||
lib.attrValues dataDisks ++ contentDirs
|
||||
);
|
||||
lib.unique (lib.attrValues dataDisks ++ contentDirs);
|
||||
};
|
||||
unitConfig.After = "snapraid-sync.service";
|
||||
};
|
||||
snapraid-sync = {
|
||||
description = "Synchronize the state of the SnapRAID array";
|
||||
startAt = sync.interval;
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
ExecStart = "${pkgs.snapraid}/bin/snapraid sync";
|
||||
Nice = 19;
|
||||
IOSchedulingPriority = 7;
|
||||
CPUSchedulingPolicy = "batch";
|
||||
serviceConfig =
|
||||
{
|
||||
Type = "oneshot";
|
||||
ExecStart = "${pkgs.snapraid}/bin/snapraid sync";
|
||||
Nice = 19;
|
||||
IOSchedulingPriority = 7;
|
||||
CPUSchedulingPolicy = "batch";
|
||||
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateTmp = true;
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
RestrictAddressFamilies = "none";
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = "@system-service";
|
||||
SystemCallErrorNumber = "EPERM";
|
||||
CapabilityBoundingSet = "CAP_DAC_OVERRIDE" +
|
||||
lib.optionalString cfg.touchBeforeSync " CAP_FOWNER";
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateTmp = true;
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
RestrictAddressFamilies = "none";
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = "@system-service";
|
||||
SystemCallErrorNumber = "EPERM";
|
||||
CapabilityBoundingSet = "CAP_DAC_OVERRIDE" + lib.optionalString cfg.touchBeforeSync " CAP_FOWNER";
|
||||
|
||||
ProtectSystem = "strict";
|
||||
ProtectHome = "read-only";
|
||||
ReadWritePaths =
|
||||
# sync requires access to directories containing content files
|
||||
# to remove them if they are stale
|
||||
let
|
||||
contentDirs = map dirOf contentFiles;
|
||||
# Multiple "split" parity files can be specified in a single
|
||||
# "parityFile", separated by a comma.
|
||||
# https://www.snapraid.it/manual#7.1
|
||||
splitParityFiles = map (s: lib.splitString "," s) parityFiles;
|
||||
in
|
||||
lib.unique (
|
||||
lib.attrValues dataDisks ++ splitParityFiles ++ contentDirs
|
||||
);
|
||||
} // lib.optionalAttrs touchBeforeSync {
|
||||
ExecStartPre = "${pkgs.snapraid}/bin/snapraid touch";
|
||||
};
|
||||
ProtectSystem = "strict";
|
||||
ProtectHome = "read-only";
|
||||
ReadWritePaths =
|
||||
# sync requires access to directories containing content files
|
||||
# to remove them if they are stale
|
||||
let
|
||||
contentDirs = map dirOf contentFiles;
|
||||
# Multiple "split" parity files can be specified in a single
|
||||
# "parityFile", separated by a comma.
|
||||
# https://www.snapraid.it/manual#7.1
|
||||
splitParityFiles = map (s: lib.splitString "," s) parityFiles;
|
||||
in
|
||||
lib.unique (lib.attrValues dataDisks ++ splitParityFiles ++ contentDirs);
|
||||
}
|
||||
// lib.optionalAttrs touchBeforeSync {
|
||||
ExecStartPre = "${pkgs.snapraid}/bin/snapraid touch";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue