jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8cffa37787
nixpkgs/nixos/modules/config/networking.nix

104 lines
3.4 KiB
Nix
Raw Normal View History

* Move global networking data (/etc/services, /etc/protocols, /etc/rpc, /etc/hosts) to modules/config/networking.nix. svn path=/nixos/branches/modular-nixos/; revision=15764
2009-05-28 12:43:54 +00:00
# /etc files related to networking, such as /etc/services.
Rewrite ‘with pkgs.lib’ -> ‘with lib’ Using pkgs.lib on the spine of module evaluation is problematic because the pkgs argument depends on the result of module evaluation. To prevent an infinite recursion, pkgs and some of the modules are evaluated twice, which is inefficient. Using ‘with lib’ prevents this problem.
2014-04-14 14:26:48 +00:00
{ config, lib, pkgs, ... }:
* Move global networking data (/etc/services, /etc/protocols, /etc/rpc, /etc/hosts) to modules/config/networking.nix. svn path=/nixos/branches/modular-nixos/; revision=15764
2009-05-28 12:43:54 +00:00
Rewrite ‘with pkgs.lib’ -> ‘with lib’ Using pkgs.lib on the spine of module evaluation is problematic because the pkgs argument depends on the result of module evaluation. To prevent an infinite recursion, pkgs and some of the modules are evaluated twice, which is inefficient. Using ‘with lib’ prevents this problem.
2014-04-14 14:26:48 +00:00
with lib;
Don't let interfaces get IPv6 addresses if networking.enableIPv6 is false
2012-10-19 19:41:01 +00:00
* Move global networking data (/etc/services, /etc/protocols, /etc/rpc, /etc/hosts) to modules/config/networking.nix. svn path=/nixos/branches/modular-nixos/; revision=15764
2009-05-28 12:43:54 +00:00
let
Don't let interfaces get IPv6 addresses if networking.enableIPv6 is false
2012-10-19 19:41:01 +00:00
Adding the hostname.domain and localhost.domain to hosts, if possible. Postfix likes this. svn path=/nixos/trunk/; revision=30362
2011-11-09 21:02:01 +00:00
cfg = config.networking;
dnsmasq: upgrade to 2.71, fixed dnsmasq module * The module now has systemd config * Add resolveLocalQueries option which sets up it as a dns server for local host (including reasonable setup of resolvconf) * Add "dnsmasq" user for running daemon * Enabled dbus and dnssec support for the package Conflicts: nixos/modules/misc/ids.nix
2014-07-02 22:59:35 +00:00
dnsmasqResolve = config.services.dnsmasq.enable &&
config.services.dnsmasq.resolveLocalQueries;
hasLocalResolver = config.services.bind.enable || dnsmasqResolve;
* Move global networking data (/etc/services, /etc/protocols, /etc/rpc, /etc/hosts) to modules/config/networking.nix. svn path=/nixos/branches/modular-nixos/; revision=15764
2009-05-28 12:43:54 +00:00
Update all legacy-style modules I.e., modules that use "require = [options]". Nowadays that should be written as { options = { ... }; config = { ... }; }; Also, use "imports" instead of "require" in places where we actually import another module.
2013-09-04 11:05:09 +00:00
in
{
* Move global networking data (/etc/services, /etc/protocols, /etc/rpc, /etc/hosts) to modules/config/networking.nix. svn path=/nixos/branches/modular-nixos/; revision=15764
2009-05-28 12:43:54 +00:00
options = {
Get all lib functions from lib, not pkgs.lib, in modules
2014-05-05 18:58:51 +00:00
networking.extraHosts = lib.mkOption {
Add lots of missing option types
2013-10-30 16:37:45 +00:00
type = types.lines;
* Move global networking data (/etc/services, /etc/protocols, /etc/rpc, /etc/hosts) to modules/config/networking.nix. svn path=/nixos/branches/modular-nixos/; revision=15764
2009-05-28 12:43:54 +00:00
default = "";
example = "192.168.0.1 lanlocalhost";
description = ''
Additional entries to be appended to <filename>/etc/hosts</filename>.
'';
};
strip trailing whitespace; no functional change svn path=/nixos/trunk/; revision=29285
2011-09-14 18:20:50 +00:00
Get all lib functions from lib, not pkgs.lib, in modules
2014-05-05 18:58:51 +00:00
networking.dnsSingleRequest = lib.mkOption {
Add lots of missing option types
2013-10-30 16:37:45 +00:00
type = types.bool;
Add an option to add 'option=single-request' to /etc/resolv.conf.
2012-10-22 04:46:05 +00:00
default = false;
description = ''
Recent versions of glibc will issue both ipv4 (A) and ipv6 (AAAA)
address queries at the same time, from the same port. Sometimes upstream
routers will systemically drop the ipv4 queries. The symptom of this problem is
that 'getent hosts example.com' only returns ipv6 (or perhaps only ipv4) addresses. The
workaround for this is to specify the option 'single-request' in
typo in networking.dnsSingleRequest documentation
2013-05-04 09:26:56 +00:00
/etc/resolv.conf. This option enables that.
Add an option to add 'option=single-request' to /etc/resolv.conf.
2012-10-22 04:46:05 +00:00
'';
};
* Move global networking data (/etc/services, /etc/protocols, /etc/rpc, /etc/hosts) to modules/config/networking.nix. svn path=/nixos/branches/modular-nixos/; revision=15764
2009-05-28 12:43:54 +00:00
};
Update all legacy-style modules I.e., modules that use "require = [options]". Nowadays that should be written as { options = { ... }; config = { ... }; }; Also, use "imports" instead of "require" in places where we actually import another module.
2013-09-04 11:05:09 +00:00
config = {
* Move global networking data (/etc/services, /etc/protocols, /etc/rpc, /etc/hosts) to modules/config/networking.nix. svn path=/nixos/branches/modular-nixos/; revision=15764
2009-05-28 12:43:54 +00:00
Update all legacy-style modules I.e., modules that use "require = [options]". Nowadays that should be written as { options = { ... }; config = { ... }; }; Also, use "imports" instead of "require" in places where we actually import another module.
2013-09-04 11:05:09 +00:00
environment.etc =
{ # /etc/services: TCP/UDP port assignments.
"services".source = pkgs.iana_etc + "/etc/services";
# /etc/protocols: IP protocol numbers.
"protocols".source = pkgs.iana_etc + "/etc/protocols";
# /etc/rpc: RPC program numbers.
"rpc".source = pkgs.glibc + "/etc/rpc";
# /etc/hosts: Hostname-to-IP mappings.
"hosts".text =
* Generate a resolvconf.conf file for openresolv. svn path=/nixos/trunk/; revision=32718
2012-03-01 14:46:47 +00:00
''
Update all legacy-style modules I.e., modules that use "require = [options]". Nowadays that should be written as { options = { ... }; config = { ... }; }; Also, use "imports" instead of "require" in places where we actually import another module.
2013-09-04 11:05:09 +00:00
127.0.0.1 localhost
${optionalString cfg.enableIPv6 ''
::1 localhost
''}
${cfg.extraHosts}
environment.etc: Add convenience option 'text' This allows writing environment.etc.hosts.text = "127.0.0.1 localhost"; instead of environment.etc.hosts.source = pkgs.writeText "hosts" "127.0.0.1 localhost";
2013-02-03 13:12:49 +00:00
'';
networkd: Support Host Resolvconf
2014-11-23 11:04:02 +00:00
Update all legacy-style modules I.e., modules that use "require = [options]". Nowadays that should be written as { options = { ... }; config = { ... }; }; Also, use "imports" instead of "require" in places where we actually import another module.
2013-09-04 11:05:09 +00:00
# /etc/resolvconf.conf: Configuration for openresolv.
"resolvconf.conf".text =
''
# This is the default, but we must set it here to prevent
# a collision with an apparently unrelated environment
# variable with the same name exported by dhcpcd.
interface_order='lo lo[0-9]*'
'' + optionalString config.services.nscd.enable ''
# Invalidate the nscd cache whenever resolv.conf is
# regenerated.
libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service'
'' + optionalString cfg.dnsSingleRequest ''
# only send one DNS request at a time
resolv_conf_options='single-request'
dnsmasq: upgrade to 2.71, fixed dnsmasq module * The module now has systemd config * Add resolveLocalQueries option which sets up it as a dns server for local host (including reasonable setup of resolvconf) * Add "dnsmasq" user for running daemon * Enabled dbus and dnssec support for the package Conflicts: nixos/modules/misc/ids.nix
2014-07-02 22:59:35 +00:00
'' + optionalString hasLocalResolver ''
Update all legacy-style modules I.e., modules that use "require = [options]". Nowadays that should be written as { options = { ... }; config = { ... }; }; Also, use "imports" instead of "require" in places where we actually import another module.
2013-09-04 11:05:09 +00:00
# This hosts runs a full-blown DNS resolver.
name_servers='127.0.0.1'
dnsmasq: upgrade to 2.71, fixed dnsmasq module * The module now has systemd config * Add resolveLocalQueries option which sets up it as a dns server for local host (including reasonable setup of resolvconf) * Add "dnsmasq" user for running daemon * Enabled dbus and dnssec support for the package Conflicts: nixos/modules/misc/ids.nix
2014-07-02 22:59:35 +00:00
'' + optionalString dnsmasqResolve ''
dnsmasq_conf=/etc/dnsmasq-conf.conf
dnsmasq_resolv=/etc/dnsmasq-resolv.conf
Update all legacy-style modules I.e., modules that use "require = [options]". Nowadays that should be written as { options = { ... }; config = { ... }; }; Also, use "imports" instead of "require" in places where we actually import another module.
2013-09-04 11:05:09 +00:00
'';
networkd: Support Host Resolvconf
2014-11-23 11:04:02 +00:00
} // (optionalAttrs config.services.resolved.enable (
if dnsmasqResolve then {
"dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
} else {
"resolv.conf".source = "/run/systemd/resolve/resolv.conf";
}
));
Update all legacy-style modules I.e., modules that use "require = [options]". Nowadays that should be written as { options = { ... }; config = { ... }; }; Also, use "imports" instead of "require" in places where we actually import another module.
2013-09-04 11:05:09 +00:00
# The ‘ip-up’ target is started when we have IP connectivity. So
# services that depend on IP connectivity (like ntpd) should be
# pulled in by this target.
systemd.targets.ip-up.description = "Services Requiring IP Connectivity";
};
* Move global networking data (/etc/services, /etc/protocols, /etc/rpc, /etc/hosts) to modules/config/networking.nix. svn path=/nixos/branches/modular-nixos/; revision=15764
2009-05-28 12:43:54 +00:00
}
Reference in New Issue Copy Permalink