Eelco Dolstra
67d5f2b444
* Require fileSystems to be set.
...
svn path=/nixos/trunk/; revision=34080
2012-05-14 01:33:11 +00:00
Eelco Dolstra
ce3941d6e6
* Move logFormat to the per-vhost options.
...
svn path=/nixos/trunk/; revision=34066
2012-05-11 23:14:05 +00:00
Eelco Dolstra
5167f5abef
* Remove a bad definition of environment.etc.
...
svn path=/nixos/trunk/; revision=34065
2012-05-11 23:08:37 +00:00
Eelco Dolstra
c4aa833e56
* Use optionSet to check environment.etc.
...
svn path=/nixos/trunk/; revision=34064
2012-05-11 23:06:35 +00:00
Rickard Nilsson
35f9502a27
Added option for specifying the path to the private key file sshd should use.
...
svn path=/nixos/trunk/; revision=34039
2012-05-09 22:13:53 +00:00
Rickard Nilsson
658ea20e7f
Added option for specifying system-wide known hosts file for OpenSSH.
...
svn path=/nixos/trunk/; revision=34038
2012-05-09 22:11:07 +00:00
Rickard Nilsson
2df81f42a5
Moved idmapd configuration file to Nix store.
...
svn path=/nixos/trunk/; revision=34037
2012-05-09 22:06:17 +00:00
Eelco Dolstra
e4200d7e61
* Some more trivial builders with lots of dependencies that should be
...
built locally.
svn path=/nixos/trunk/; revision=34034
2012-05-09 21:35:47 +00:00
Peter Simons
7a69733704
Added 'networking.dhcpcd.denyInterfaces' to extend the list of network
...
interfaces black-listed for dhcpcd via configuration.nix. I use this option to
disable DHCP for "veth*" interfaces, which are created by LXC for use inside of
virtual machines.
svn path=/nixos/trunk/; revision=34018
2012-05-08 11:46:01 +00:00
Shea Levy
1a0c9ce201
The efibootmgr bricking problem was fixed in 2.6.39
...
svn path=/nixos/trunk/; revision=33990
2012-05-05 15:43:28 +00:00
Shea Levy
c716747cce
Need a slighty bigger boot image to contain the efi shell
...
svn path=/nixos/trunk/; revision=33986
2012-05-05 14:23:51 +00:00
Shea Levy
3aae8bfa61
Switch to using efi shell + startup.nsh as the
...
removable media efi boot option.
svn path=/nixos/trunk/; revision=33984
2012-05-04 22:16:35 +00:00
Sander van der Burg
4b650026bf
The <> syntax has to be applied properly, in order to find build-vms.nix
...
svn path=/nixos/trunk/; revision=33981
2012-05-03 12:31:01 +00:00
Eelco Dolstra
b603babd0f
* Use PostgreSQL's fast shutdown mode. In the default
...
smart shutdown mode, Postgres waits until all
active connections have closed, which can take an
unbounded amount of time.
svn path=/nixos/trunk/; revision=33959
2012-04-30 18:15:32 +00:00
Eelco Dolstra
be189991e0
* Revert r33928: veth* can also be a bridged interface requiring dhcp.
...
See e.g. https://nixos.org/repos/nix/configurations/trunk/tud/stan.nix
So we need a better solution for this...
svn path=/nixos/trunk/; revision=33957
2012-04-30 17:46:11 +00:00
Eelco Dolstra
03f2847054
* Set preferLocalBuild on a few trivial top-level derivations. These
...
tend to cause a lot of unnecessary I/O to the build machines.
svn path=/nixos/trunk/; revision=33936
2012-04-26 15:19:23 +00:00
Eelco Dolstra
836fa3b6ae
* Fix missing semicolon.
...
svn path=/nixos/trunk/; revision=33933
2012-04-26 14:53:58 +00:00
Eelco Dolstra
4d07f159a1
* Create /nix/var/nix/profiles/per-user with the right permissions.
...
Fixes NixOS/149.
svn path=/nixos/trunk/; revision=33929
2012-04-26 13:16:58 +00:00
Peter Simons
8b841505ff
modules/services/networking/{dhclient,dhcpcd}.nix: ignore virtual veth* devices created by LXC/cgroups
...
svn path=/nixos/trunk/; revision=33928
2012-04-26 12:31:33 +00:00
Peter Simons
8c93993e1b
modules/system/boot/luksroot.nix: fixed the descriptions of the options defined in this module
...
svn path=/nixos/trunk/; revision=33927
2012-04-26 12:21:45 +00:00
Peter Simons
86ba0c52b3
modules/services/networking/ssh/sshd.nix: stripped trailing whitespace
...
svn path=/nixos/trunk/; revision=33926
2012-04-26 08:13:24 +00:00
Peter Simons
ee2fcb645b
modules/services/networking/ssh/sshd.nix: don't write debug output to /tmp/log
...
svn path=/nixos/trunk/; revision=33925
2012-04-26 08:13:21 +00:00
Eelco Dolstra
e6fd0fa893
* Cleanup.
...
svn path=/nixos/trunk/; revision=33921
2012-04-25 15:44:47 +00:00
Eelco Dolstra
43215ff80f
* In the implementation of the ‘authorizedKeys’, don't delete all
...
lines below a certain marker. This is undesirable because commands
like "ssh-copy-id" add keys to the end of the file. Instead mark
all automatically added lines individually.
svn path=/nixos/trunk/; revision=33918
2012-04-25 14:14:20 +00:00
Ludovic Courtès
a98ad26fea
GNU: Comment `fdisk' out.
...
svn path=/nixos/trunk/; revision=33907
2012-04-24 12:54:42 +00:00
Eelco Dolstra
ac4a059f8a
* Put old NixOS configurations in a GRUB submenu. Contributed by
...
Andreas Källberg.
svn path=/nixos/trunk/; revision=33891
2012-04-23 15:47:03 +00:00
Eelco Dolstra
6c1bb54483
* In the installation CD, make the NixOS/Nixpkgs available as if they
...
were obtained from the NixOS channel. "nixos-install" copies this
to the installed system as well.
* In the installation CD, set GC_INITIAL_HEAP_SIZE to a low value for
the benefit of memory-constrained environments.
svn path=/nixos/trunk/; revision=33887
2012-04-23 00:41:37 +00:00
Eelco Dolstra
72990dae37
* Add some missing GRUB modules.
...
svn path=/nixos/trunk/; revision=33886
2012-04-23 00:30:48 +00:00
Eelco Dolstra
9195b1125f
* Include the version number in the mingetty greeting line.
...
svn path=/nixos/trunk/; revision=33884
2012-04-22 23:35:34 +00:00
Eelco Dolstra
f1a99bd914
* Subscribe the root user to the NixOS channel by default.
...
svn path=/nixos/trunk/; revision=33883
2012-04-22 22:43:57 +00:00
Eelco Dolstra
d96f330fcf
* Slight simplification.
...
svn path=/nixos/trunk/; revision=33877
2012-04-22 16:28:08 +00:00
Eelco Dolstra
d587329615
* Turn users.extraGroups into an attribute set (using types.loaOf).
...
Also the gid is looked up in ids.gids if not specified.
svn path=/nixos/trunk/; revision=33860
2012-04-20 12:55:09 +00:00
Eelco Dolstra
235ea24ec4
* Remove unused option "user". Not clear what it was supposed to do.
...
svn path=/nixos/trunk/; revision=33857
2012-04-20 12:22:08 +00:00
Eelco Dolstra
fa50d105d7
* Pass -cpu kvm64 in NixOS VMs (and add a simple regression test for
...
GMP).
svn path=/nixos/trunk/; revision=33849
2012-04-19 18:56:35 +00:00
Eelco Dolstra
43f43fd185
* Only stop libvirt-guests automatically on system shutdown.
...
Saving/restoring VMs is disruptive.
svn path=/nixos/trunk/; revision=33844
2012-04-19 15:12:55 +00:00
Arie Middelkoop
0cb5673400
Some additional synaptics settings.
...
svn path=/nixos/trunk/; revision=33837
2012-04-19 08:29:22 +00:00
Arie Middelkoop
298e0e1829
Some additional xinetd settings.
...
svn path=/nixos/trunk/; revision=33836
2012-04-19 08:28:54 +00:00
Eelco Dolstra
f8e36664a6
* Subtle: since nix-env processes flags in order, any ‘-I’ flag should
...
come before ‘-f <nixos>’.
svn path=/nixos/trunk/; revision=33831
2012-04-18 15:01:42 +00:00
Eelco Dolstra
cb74284b75
* Handle the case where there is no GRUB 1 splash image.
...
svn path=/nixos/trunk/; revision=33830
2012-04-18 14:28:30 +00:00
Eelco Dolstra
b4afefcc40
* Typo.
...
svn path=/nixos/trunk/; revision=33826
2012-04-18 12:32:17 +00:00
Eelco Dolstra
395d73db70
* nixos-rebuild: don't do a pull of the manifest by default anymore.
...
It's not necessary when using the NixOS channel. "nixos-rebuild
pull" now pulls from the NixOS channel.
svn path=/nixos/trunk/; revision=33825
2012-04-18 11:46:16 +00:00
Eelco Dolstra
6abf3c8a97
* Change $NIXPKGS_CONFIG to a better location (/etc/nix instead of
...
/nix/etc). Not sure the default profile should be setting this at
all though.
svn path=/nixos/trunk/; revision=33824
2012-04-18 10:59:57 +00:00
Eelco Dolstra
7ba5881146
* Don't install the "nixpkgs_sys" symlink in ~/.nix-defexpr anymore.
...
Note that for attribute-based nix-env installations, the NixOS
channel contains Nixpkgs as its "pkgs" attribute, so
$ nix-env -iA nixos.pkgs.foo
will work instead of the old
$ nix-env -iA nixpkgs_sys.foo
* Fix the path to root's channels installed in ~/.nix-defexpr.
svn path=/nixos/trunk/; revision=33823
2012-04-18 10:58:33 +00:00
Eelco Dolstra
a193fe4f1d
* Add root's NixOS channel to $NIX_PATH. Will remove
...
/etc/nixos/{nixos,nixpkgs,services} eventually.
svn path=/nixos/trunk/; revision=33822
2012-04-18 10:34:39 +00:00
Eelco Dolstra
e3879fe365
* Store the NixOS version in the top-level derivation.
...
* Change the name of the top-level derivation from "system" to
"nixos-<version>".
* Show the NixOS version in the GRUB boot menu instead of the kernel
version.
svn path=/nixos/trunk/; revision=33785
2012-04-14 17:09:59 +00:00
Mathijs Kwik
3bbaa3b60c
slim display manager: enabled auto_login setting
...
useful for demo/kiosk mode
svn path=/nixos/trunk/; revision=33774
2012-04-13 14:52:25 +00:00
Eelco Dolstra
2821289aeb
* Ugly hack: force udev to exit to prevent random "Device or resource
...
busy while trying to open /dev/xvda" errors from fsck.
svn path=/nixos/trunk/; revision=33766
2012-04-12 18:01:19 +00:00
Eelco Dolstra
185e9b69ed
* Assume that the ephemeral devices are called /dev/xvda-e. So
...
in Charon deployments, non-ephemeral devices should be >= /dev/xvdf.
svn path=/nixos/trunk/; revision=33764
2012-04-12 16:48:01 +00:00
Eelco Dolstra
f2fd48e131
* Fix the "autocreate" option.
...
svn path=/nixos/trunk/; revision=33750
2012-04-11 21:21:00 +00:00
Sander van der Burg
a34e20e292
deployment attribute does not exists anymore, will fix this later
...
svn path=/nixos/trunk/; revision=33747
2012-04-11 13:46:49 +00:00
Lluís Batlle i Rossell
918edf8612
I think this makes the memtest module work on grub1.
...
But I can't test it because grub-install fails for me for grub1.
I tested it works for grub2.
svn path=/nixos/trunk/; revision=33739
2012-04-10 22:20:20 +00:00
Eelco Dolstra
fb0a54b803
* In nixos-install, do a nix-pull from
...
http://nixos.org/releases/nixos/nixos- <version> to ensure we're
getting the right binaries.
svn path=/nixos/trunk/; revision=33738
2012-04-10 22:17:37 +00:00
Eelco Dolstra
322a0ff7cd
* Set the version properly in the source tree in the ISO.
...
svn path=/nixos/trunk/; revision=33736
2012-04-10 21:42:47 +00:00
Lluís Batlle i Rossell
2ca7e8a43e
Reverting 33692, because memtest in the iso was failing.
...
I set the grub entry for memtest to read "Memtest86", as suggested by Eelco.
I run:
svn merge -c -33692 ^/nixos/trunk
And edited the change a bit.
svn path=/nixos/trunk/; revision=33734
2012-04-10 21:18:48 +00:00
Eelco Dolstra
c02240082a
* Add missing file.
...
svn path=/nixos/trunk/; revision=33733
2012-04-10 21:17:43 +00:00
Eelco Dolstra
dccd99b564
* Disable "nixos-gen-seccure-keys": it's not clear what it's for, it's
...
not documented, and it doesn't seem to be used anywhere.
svn path=/nixos/trunk/; revision=33732
2012-04-10 21:11:11 +00:00
Eelco Dolstra
907df082dc
* Including the Nixpkgs revision made the ISO volume label slightly
...
too long. So make it shorter.
svn path=/nixos/trunk/; revision=33731
2012-04-10 21:08:10 +00:00
Eelco Dolstra
096b7723c8
* Add a command "nixos-version" that prints the version of the
...
currently activated NixOS. This is "0.1pre-svn" when built from a
SVN tree, but contains the actual revision when installed from the
NixOS channel or from the ISO.
svn path=/nixos/trunk/; revision=33730
2012-04-10 20:56:38 +00:00
Eelco Dolstra
f9ac67c67f
* Copying manifests is slightly tricky because
...
download-using-manifests expects that the files in
/nix/var/nix/manifests are symlinks into the store.
svn path=/nixos/trunk/; revision=33727
2012-04-10 15:36:50 +00:00
Eelco Dolstra
f37b453b19
* nixos-install: Ensure that builds are done by the nixbld users
...
rather than root. Also copy all manifests into the chroot so that
any nix-pull done outside the chroot is "inherited".
svn path=/nixos/trunk/; revision=33725
2012-04-10 14:39:12 +00:00
Eelco Dolstra
f9e8e735bb
* Remove debug line.
...
svn path=/nixos/trunk/; revision=33723
2012-04-10 13:28:48 +00:00
Eelco Dolstra
5c06c66b68
* Clear more locale-related variables in the installer.
...
svn path=/nixos/trunk/; revision=33722
2012-04-10 13:28:17 +00:00
Eelco Dolstra
b2025c4687
* Use "umount -l" to clean up.
...
svn path=/nixos/trunk/; revision=33721
2012-04-10 13:25:55 +00:00
Eelco Dolstra
5409e76353
* Disable wicd in the installation CD for now, because it causes
...
dhcpcd to segfault randomly or give corrupt output. See e.g.
http://hydra.nixos.org/build/2380666/nixlog/1/raw
The problem seems to be that wicd sends a "-k" command to dhcpcd to
release the interface, which doesn't work well with a dhcpcd that
handles all interfaces in one process.
svn path=/nixos/trunk/; revision=33720
2012-04-10 13:09:56 +00:00
Eelco Dolstra
a7af5588b6
* Drop ugly reference to var/run/current-system/sw/sbin/wpa_cli, and
...
make it conditional.
svn path=/nixos/trunk/; revision=33717
2012-04-10 12:07:30 +00:00
Eelco Dolstra
83679c99b1
* Don't put /var and /nix on ephemeral storage if we're booting
...
from EBS.
svn path=/nixos/trunk/; revision=33716
2012-04-10 11:11:05 +00:00
Lluís Batlle i Rossell
849d136aa6
Making also the system-tarball-pc show the memtest entry as the
...
pkgs.memtest86.name.
svn path=/nixos/trunk/; revision=33693
2012-04-09 20:37:54 +00:00
Lluís Batlle i Rossell
9017ccf9fe
Removing the special memtest.nix module for the isos, and using
...
the same as the usual nixos. I think this trivial change works;
I checked the grub.cfg output generated in the iso_minimal.
svn path=/nixos/trunk/; revision=33692
2012-04-09 20:36:26 +00:00
Lluís Batlle i Rossell
6e281e46b7
I update the name of the memtest entry in grub of the iso images,
...
because it can be overriden choosing another memtest86.
As an effect of a change in nixpgks, the isos will include
memtest86 4.0a instead of memtest86+ 4.20, only because the
former is released later, and I deduce it should work better.
svn path=/nixos/trunk/; revision=33691
2012-04-09 20:30:14 +00:00
Lluís Batlle i Rossell
0b8b6616b6
Making the memtest name come from the pkgs.memtest86, as the nixos
...
user can override choosing between two memtests.
svn path=/nixos/trunk/; revision=33690
2012-04-09 20:08:14 +00:00
Rob Vermaas
6b34bd8564
remove remaining reference to nixos-deploy-nwtork
...
svn path=/nixos/trunk/; revision=33663
2012-04-07 15:18:39 +00:00
Eelco Dolstra
301c4d96b1
* Remove nixos-deploy-network. It has been superceded by Charon.
...
svn path=/nixos/trunk/; revision=33662
2012-04-07 13:26:35 +00:00
Eelco Dolstra
6e7859814c
* Move misc/deployment.nix to Charon, since these options don't really
...
make sense outside of a Charon deployment.
svn path=/nixos/trunk/; revision=33661
2012-04-07 13:17:03 +00:00
Peter Simons
ec3dca188c
Dropped the unused/unknown/obsolete module i8042 from 'boot.initrd.kernelModules'.
...
svn path=/nixos/trunk/; revision=33654
2012-04-06 19:21:50 +00:00
Eelco Dolstra
4f4c529979
Stage 1 improvements:
...
* Load scsi_wait_scan after all other kernel modules to ensure that
all SCSI device nodes have been created.
* Increase the timeout for the appearance of the root device to 20
seconds.
* Do a "udevadm settle" just after the root device has appeared to
make sure that udev isn't accessing the device anymore (hopefully).
On EC2 (Xen), I've seen fsck on the root fail randomly with "device
in use" errors.
svn path=/nixos/trunk/; revision=33650
2012-04-06 14:20:43 +00:00
Eelco Dolstra
1e8e83408b
* Revert unintended commit.
...
svn path=/nixos/trunk/; revision=33646
2012-04-06 12:23:44 +00:00
Eelco Dolstra
852e513638
* Handle booting from /dev/xvda.
...
svn path=/nixos/trunk/; revision=33645
2012-04-06 12:23:12 +00:00
Eelco Dolstra
e44b87dd31
* Pass --no-sessions to Upstart to make sure users cannot start
...
Upstart jobs (even when Upstart has attached to D-Bus).
svn path=/nixos/trunk/; revision=33617
2012-04-05 12:27:21 +00:00
Mathijs Kwik
9a91181be9
damn you shell syntax! :)
...
svn path=/nixos/trunk/; revision=33603
2012-04-05 08:20:43 +00:00
Lluís Batlle i Rossell
56d9e60bb7
Making bind start on started network-interfaces. It wasn't starting ever.
...
svn path=/nixos/trunk/; revision=33542
2012-04-02 18:28:42 +00:00
Lluís Batlle i Rossell
fbd4f65652
Fixing the comment on the new grub/memtest.nix module.
...
svn path=/nixos/trunk/; revision=33540
2012-04-02 17:31:08 +00:00
Lluís Batlle i Rossell
9a6f2231b2
Adding a module for memtest86+, so if enabled, will appear in the grub menu.
...
To enable it:
boot.loader.grub.memtest86 = true;
svn path=/nixos/trunk/; revision=33539
2012-04-02 17:19:21 +00:00
Mathijs Kwik
a1e86494d0
made challenge-response authentication method configurable for openssh
...
challenge-response is an authentication method that does not need the
plain text password to be emitted over the (encrypted) connection.
This is nice if you don't fully trust the server.
It is enabled (upstream) by default.
To the end user, it still looks like normal password authentication,
but instead of sending it, it is used to hash some challenge.
This means that if you don't want passwords to be used ever at all,
and just stick to public key authentication, you probably want to
disable this option too.
svn path=/nixos/trunk/; revision=33513
2012-04-01 10:54:17 +00:00
Mathijs Kwik
e216ce07df
dhcpcd: ip-up and ip-down emit more info (like wifi access point)
...
useful to only start certain services (like vpn) on certain networks
svn path=/nixos/trunk/; revision=33512
2012-04-01 10:54:15 +00:00
Mathijs Kwik
7d4fd69b5f
dhcpcd: wifi disconnect should also generate ip-down
...
svn path=/nixos/trunk/; revision=33511
2012-04-01 10:54:13 +00:00
Mathijs Kwik
7ba690add6
optionally allow normal users to control wpa_supplicant through
...
wpa_gui or wpa_cli.
Comes with a default wpa_supplicant.conf, which gets updated through
aforementioned utilities.
svn path=/nixos/trunk/; revision=33510
2012-04-01 10:54:10 +00:00
Mathijs Kwik
7f84957ff2
mongodb: allow running as a replicaset member
...
also useful for point-in time backups using mongodump --oplog
svn path=/nixos/trunk/; revision=33509
2012-04-01 10:54:08 +00:00
Mathijs Kwik
de5b437004
assertions '.msg' doesn't exist => .message
...
svn path=/nixos/trunk/; revision=33508
2012-04-01 10:54:06 +00:00
Joachim Schiele
bc6ca7944f
fixed a upstart issue where upsd was never started
...
svn path=/nixos/trunk/; revision=33494
2012-03-31 11:39:30 +00:00
Lluís Batlle i Rossell
f4883572d8
Making the init interactive shells handle well console kernel parameters
...
with extra parameters, like console=ttyS0,115200.
svn path=/nixos/trunk/; revision=33458
2012-03-28 19:58:44 +00:00
Eelco Dolstra
1d3c7e2a2d
* Added a ‘deployment.ec2.tags’ option.
...
svn path=/nixos/trunk/; revision=33449
2012-03-28 13:02:55 +00:00
Joachim Schiele
f4d26eb446
added example for GRUB 2
...
svn path=/nixos/trunk/; revision=33448
2012-03-28 10:34:40 +00:00
Eelco Dolstra
040042b8a5
* Blackhole the address 169.254.169.254 after we've obtained the user
...
data to prevent non-root processes from getting the private host
key.
svn path=/nixos/trunk/; revision=33442
2012-03-27 14:51:08 +00:00
Eelco Dolstra
64241a3e90
* Flush nscd when switching to a new configuration.
...
svn path=/nixos/trunk/; revision=33441
2012-03-27 14:35:45 +00: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
Mathijs Kwik
f31fefdfd9
splitted ssh/sshd X11 forwarding logic. Backward compatible change.
...
You can now set the forwardX11 config option for the ssh client and server separately.
For server, the option means "allow clients to request X11 forwarding".
For client, the option means "request X11 forwarding by default on all connections".
I don't think it made sense to couple them. I might not even run the server on some machines.
Also, I ssh to a lot of machines, and rarely want X11 forwarding. The times I want it,
I use the -X/-Y option, or set it in my ~/.ssh/config.
I also decoupled the 'XAuthLocation' logic from forwardX11.
For my case where ssh client doesn't want forwarding by default, it still wants to set the path for the cases I do need it.
As this flag is the one that pulls in X11 dependencies, I changed the minimal profile and the no-x-libs config to check that instead now.
svn path=/nixos/trunk/; revision=33407
2012-03-25 15:42:05 +00:00
Lluís Batlle i Rossell
9fb07d4036
Making a reference single-quoted for grubDevices, as after substitution, there
...
will be doublequoted elements.
Suggested by Kirelagin.
svn path=/nixos/trunk/; revision=33403
2012-03-25 12:36:43 +00:00
Eelco Dolstra
70e1958bb6
* New 64-bit AMIs.
...
svn path=/nixos/trunk/; revision=33390
2012-03-23 21:22:58 +00:00
Eelco Dolstra
326891443c
* dhcpcd: Don't use the "persistent" option. With it, dhcpcd won't
...
delete routes and addresses when it quits. This causes those routes
and addresses to stick around forever, since dhcpcd won't delete
them when it runs next (even if it acquires a new lease on the same
interface). This is bad; in particular the stale (default) routes
can break networking.
The downside to removing "persistent" is that you should never ever
do "stop dhcpcd" on a remote machine configured by dhcpcd.
svn path=/nixos/trunk/; revision=33388
2012-03-23 21:00:32 +00:00