systemd service: rename generator-packages
This commit is contained in:
parent
cc9fb5f015
commit
fd405dab3e
@ -257,6 +257,9 @@ with lib;
|
||||
(mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ])
|
||||
(mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ])
|
||||
|
||||
# systemd
|
||||
(mkRenamedOptionModule [ "systemd" "generator-packages" ] [ "systemd" "generatorPackages" ])
|
||||
|
||||
] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
|
||||
"jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
|
||||
"snmpExporter" "unifiExporter" "varnishExporter" ]
|
||||
|
@ -497,7 +497,7 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.generator-packages = mkOption {
|
||||
systemd.generatorPackages = mkOption {
|
||||
default = [];
|
||||
type = types.listOf types.package;
|
||||
example = literalExample "[ pkgs.systemd-cryptsetup-generator ]";
|
||||
@ -762,10 +762,10 @@ in
|
||||
|
||||
environment.etc = let
|
||||
# generate contents for /etc/systemd/system-generators from
|
||||
# systemd.generators and systemd.generator-packages
|
||||
# systemd.generators and systemd.generatorPackages
|
||||
generators = pkgs.runCommand "system-generators" {
|
||||
preferLocalBuild = true;
|
||||
packages = cfg.generator-packages;
|
||||
packages = cfg.generatorPackages;
|
||||
} ''
|
||||
mkdir -p $out
|
||||
for package in $packages
|
||||
|
@ -56,7 +56,7 @@ in
|
||||
boot.initrd.kernelModules = mkIf inInitrd [ "nfs" ];
|
||||
|
||||
systemd.packages = [ pkgs.nfs-utils ];
|
||||
systemd.generator-packages = [ pkgs.nfs-utils ];
|
||||
systemd.generatorPackages = [ pkgs.nfs-utils ];
|
||||
|
||||
environment.etc = {
|
||||
"idmapd.conf".source = idmapdConfFile;
|
||||
|
Loading…
Reference in New Issue
Block a user