public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: use attrs instead of list for types.loaOf options

Browse Source
This commit is contained in:
rnhmjoj
2020-01-06 10:39:18 -05:00
committed by worldofpeace
parent 6bd13ccd8e
commit 1d61efb7f1
153 changed files with 811 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/networking/pppd.nix
+6 -4
View File
@@ -64,11 +64,13 @@ in
enabledConfigs = filter (f: f.enable) (attrValues cfg.peers);
mkEtc = peerCfg: {
"ppp/peers/${peerCfg.name}".text = peerCfg.config;
name = "ppp/peers/${peerCfg.name}";
value.text = peerCfg.config;
};
mkSystemd = peerCfg: {
"pppd-${peerCfg.name}" = {
name = "pppd-${peerCfg.name}";
value = {
restartTriggers = [ config.environment.etc."ppp/peers/${peerCfg.name}".source ];
before = [ "network.target" ];
wants = [ "network.target" ];
@@ -124,8 +126,8 @@ in
};
};
etcFiles = map mkEtc enabledConfigs;
systemdConfigs = map mkSystemd enabledConfigs;
etcFiles = listToAttrs (map mkEtc enabledConfigs);
systemdConfigs = listToAttrs (map mkSystemd enabledConfigs);
in mkIf cfg.enable {
environment.etc = mkMerge etcFiles;