diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-02-19 14:12:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-19 14:12:58 +0000 |
| commit | 10b3f7d3564d4ef1deeaed7ece130588d5ba1905 (patch) | |
| tree | 5c551c6f5aa44f598d1bdc00ba23006fb65e13d4 /nixos/modules/services | |
| parent | e37b756b91a0713cefdf8a53d78feadcd00a40fc (diff) | |
| parent | 06517547519737cd4c719b0c8ef78d046816f57e (diff) | |
| download | nixlib-10b3f7d3564d4ef1deeaed7ece130588d5ba1905.tar nixlib-10b3f7d3564d4ef1deeaed7ece130588d5ba1905.tar.gz nixlib-10b3f7d3564d4ef1deeaed7ece130588d5ba1905.tar.bz2 nixlib-10b3f7d3564d4ef1deeaed7ece130588d5ba1905.tar.lz nixlib-10b3f7d3564d4ef1deeaed7ece130588d5ba1905.tar.xz nixlib-10b3f7d3564d4ef1deeaed7ece130588d5ba1905.tar.zst nixlib-10b3f7d3564d4ef1deeaed7ece130588d5ba1905.zip | |
Merge pull request #27688 from rnhmjoj/routes
nixos/networking-interfaces: make static routes configurable
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/networking/dhcpcd.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/security/hologram-agent.nix | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index d283c7624335..d10b72ecf058 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -16,7 +16,7 @@ let # Don't start dhcpcd on explicitly configured interfaces or on # interfaces that are part of a bridge, bond or sit device. ignoredInterfaces = - map (i: i.name) (filter (i: if i.useDHCP != null then !i.useDHCP else i.ip4 != [ ] || i.ipAddress != null) interfaces) + map (i: i.name) (filter (i: if i.useDHCP != null then !i.useDHCP else i.ipv4.addresses != [ ]) interfaces) ++ mapAttrsToList (i: _: i) config.networking.sits ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges)) ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.vswitches)) diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix index 6c53a2df6306..39ed506f7617 100644 --- a/nixos/modules/services/security/hologram-agent.nix +++ b/nixos/modules/services/security/hologram-agent.nix @@ -35,10 +35,9 @@ in { config = mkIf cfg.enable { boot.kernelModules = [ "dummy" ]; - networking.interfaces.dummy0 = { - ipAddress = "169.254.169.254"; - prefixLength = 32; - }; + networking.interfaces.dummy0.ipv4.addresses = [ + { address = "169.254.169.254"; prefixLength = 32; } + ]; systemd.services.hologram-agent = { description = "Provide EC2 instance credentials to machines outside of EC2"; |