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