mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-11-24 17:43:19 +01:00
4f0dadbf38
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
91 lines
2.7 KiB
Nix
91 lines
2.7 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
pkgs,
|
|
...
|
|
}:
|
|
with lib;
|
|
let
|
|
cfg = config.services.openiscsi;
|
|
in
|
|
{
|
|
options.services.openiscsi = with types; {
|
|
enable = mkEnableOption "the openiscsi iscsi daemon";
|
|
enableAutoLoginOut = mkEnableOption ''
|
|
automatic login and logout of all automatic targets.
|
|
You probably do not want this
|
|
'';
|
|
discoverPortal = mkOption {
|
|
type = nullOr str;
|
|
default = null;
|
|
description = "Portal to discover targets on";
|
|
};
|
|
name = mkOption {
|
|
type = str;
|
|
description = "Name of this iscsi initiator";
|
|
example = "iqn.2020-08.org.linux-iscsi.initiatorhost:example";
|
|
};
|
|
package = mkPackageOption pkgs "openiscsi" { };
|
|
|
|
extraConfig = mkOption {
|
|
type = str;
|
|
default = "";
|
|
description = "Lines to append to default iscsid.conf";
|
|
};
|
|
|
|
extraConfigFile = mkOption {
|
|
description = ''
|
|
Append an additional file's contents to /etc/iscsid.conf. Use a non-store path
|
|
and store passwords in this file.
|
|
'';
|
|
default = null;
|
|
type = nullOr str;
|
|
};
|
|
};
|
|
|
|
config = mkIf cfg.enable {
|
|
environment.etc."iscsi/iscsid.conf.fragment".source = pkgs.runCommand "iscsid.conf" { } ''
|
|
cat "${cfg.package}/etc/iscsi/iscsid.conf" > $out
|
|
cat << 'EOF' >> $out
|
|
${cfg.extraConfig}
|
|
${optionalString cfg.enableAutoLoginOut "node.startup = automatic"}
|
|
EOF
|
|
'';
|
|
environment.etc."iscsi/initiatorname.iscsi".text = "InitiatorName=${cfg.name}";
|
|
|
|
systemd.packages = [ cfg.package ];
|
|
|
|
systemd.services."iscsid" = {
|
|
wantedBy = [ "multi-user.target" ];
|
|
preStart =
|
|
let
|
|
extraCfgDumper = optionalString (cfg.extraConfigFile != null) ''
|
|
if [ -f "${cfg.extraConfigFile}" ]; then
|
|
printf "\n# The following is from ${cfg.extraConfigFile}:\n"
|
|
cat "${cfg.extraConfigFile}"
|
|
else
|
|
echo "Warning: services.openiscsi.extraConfigFile ${cfg.extraConfigFile} does not exist!" >&2
|
|
fi
|
|
'';
|
|
in
|
|
''
|
|
(
|
|
cat ${config.environment.etc."iscsi/iscsid.conf.fragment".source}
|
|
${extraCfgDumper}
|
|
) > /etc/iscsi/iscsid.conf
|
|
'';
|
|
};
|
|
systemd.sockets."iscsid".wantedBy = [ "sockets.target" ];
|
|
|
|
systemd.services."iscsi" = mkIf cfg.enableAutoLoginOut {
|
|
wantedBy = [ "remote-fs.target" ];
|
|
serviceConfig.ExecStartPre =
|
|
mkIf (cfg.discoverPortal != null)
|
|
"${cfg.package}/bin/iscsiadm --mode discoverydb --type sendtargets --portal ${escapeShellArg cfg.discoverPortal} --discover";
|
|
};
|
|
|
|
environment.systemPackages = [ cfg.package ];
|
|
boot.kernelModules = [ "iscsi_tcp" ];
|
|
};
|
|
}
|