Eelco Dolstra
1daab1ebf5
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 14:28:18 +01:00
Eelco Dolstra
ab238804b8
Turn environment.etc into an attribute set
...
This provides a more convenient syntax and allows easier overriding.
For example,
environment.etc = singleton
{ target = "vconsole.conf";
source = vconsoleConf;
};
can now be written as
environment.etc."vconsole.conf".source = vconsoleConf;
2013-02-03 14:28:18 +01:00
Eelco Dolstra
f0a1e5e356
Use systemd.targets to define ip-up
2013-01-24 15:40:56 +01:00
Eelco Dolstra
ae4e94d9ac
Rename ‘boot.systemd’ to ‘systemd’
...
Suggested by Mathijs Kwik. ‘boot.systemd’ is a misnomer because
systemd affects more than just booting. And it saves some typing.
2013-01-16 12:33:18 +01:00
Eelco Dolstra
b1da38f564
Merge remote-tracking branch 'origin/master' into systemd
2012-11-30 16:12:04 +01:00
Jack Cummings
1cbad692c3
Add an option to add 'option=single-request' to /etc/resolv.conf.
2012-10-21 21:49:21 -07:00
Eelco Dolstra
c8628e0293
Don't let interfaces get IPv6 addresses if networking.enableIPv6 is false
2012-10-19 15:41:01 -04:00
Eelco Dolstra
dd3fe9d792
Merge remote-tracking branch 'origin/master' into systemd
...
Conflicts:
modules/services/system/nscd.nix
2012-10-08 13:47:37 -04:00
Eelco Dolstra
2b2f0067b8
Add an /etc/hosts entry mapping localhost to ::1
2012-10-07 00:46:24 -04:00
Eelco Dolstra
570e523a88
Remove 127.0.0.1 mapping for the system's hostname
...
Also remove the <hostname>.<domain> mapping.
2012-10-07 00:40:00 -04:00
Eelco Dolstra
d18c2afc6f
Add an ip-up target for services that require IP connectivity
2012-08-15 15:38:52 -04:00
Eelco Dolstra
4475294f57
Fix a hang during shutdown
...
Subtle: dhcpcd.service would call resolvconf during shutdown, which in
turn would start invalidate-nscd.service, causing the shutdown to be
cancelled. Instead, give nscd.service a proper reload action, and do
"systemctl reload --no-block nscd.service". The --no-block is
necessary to prevent that command from waiting until a timeout occurs
(bug in systemd?).
2012-08-14 16:45:50 -04:00
Eelco Dolstra
44d091674b
Merge branch 'master' of github.com:NixOS/nixos into systemd
...
Conflicts:
modules/config/networking.nix
modules/services/networking/ssh/sshd.nix
modules/services/ttys/agetty.nix
modules/system/boot/stage-2-init.sh
modules/system/upstart-events/shutdown.nix
2012-07-16 17:27:11 -04:00
Peter Simons
56373744b4
modules/config/networking.nix: recognize whether a local DNS resolver is available
...
resolvconf prefers a locally running BIND resolver over the forwarders; we just
have to tell it whether we have one or not. We use 'config.services.bind.enable'
to make that decision, assuming that people are not going to configure a local
BIND that won't respond to queries on 127.0.0.1. If we run into such a (weird)
case, then we'll need to introduce another variable for that purpose which can
be set independently from 'config.services.bind.enable'.
2012-07-02 15:01:02 +02:00
Eelco Dolstra
4a95f8996b
To ease migration to systemd, generate units from the ‘jobs’ option
...
Also get rid of the ‘buildHook’ job option because it wasn't very useful.
2012-06-16 00:19:43 -04:00
Eelco Dolstra
da6046ef6b
* Fix the generation of resolvconf.conf.
...
svn path=/nixos/trunk/; revision=33435
2012-03-26 22:14:47 +00:00
Lluís Batlle i Rossell
e9d641014d
Not everyone runs nscd. Fixing a boot problem for those who don't.
...
svn path=/nixos/trunk/; revision=33434
2012-03-26 21:01:46 +00:00
Eelco Dolstra
e8539b6f60
* Generate a resolvconf.conf file for openresolv.
...
svn path=/nixos/trunk/; revision=32718
2012-03-01 14:46:47 +00:00
Peter Simons
8c88506e05
modules/config/networking.nix: list extraHosts *after* the local hostname
...
This change allows using extraHosts to specify additional aliases for 127.0.0.1
without overriding the local hostname in the process.
svn path=/nixos/trunk/; revision=32711
2012-02-29 21:25:12 +00:00
Michael Raskin
d06c45ec86
Let hostname --fqdn find proper hostname
...
svn path=/nixos/trunk/; revision=30976
2011-12-20 12:35:12 +00:00
Lluís Batlle i Rossell
de5eedb612
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
Peter Simons
eb6e1310b8
strip trailing whitespace; no functional change
...
svn path=/nixos/trunk/; revision=29285
2011-09-14 18:20:50 +00:00
Ludovic Courtès
fa9f557b96
Add `localhost' under its "real" host name to /etc/hosts.
...
svn path=/nixos/branches/modular-nixos/; revision=16258
2009-07-08 16:10:09 +00:00
Eelco Dolstra
e4716ce3ef
* 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