Commit Graph

3406 Commits

Author SHA1 Message Date
Rickard Nilsson
8c35333e09 opentsdb nixos module: Add option for defining OpenTSDB's configuration
(cherry picked from commit c0a83cbc49)
2015-09-30 18:32:16 +02:00
Peter Simons
a06d46cd2d rl-1509.xml: update Haskell-related release notes
- Update the link to the manual to refer to the proper place.
 - Mention LTS Haskell and Stackage Nightly.
 - Minor cosmetic to improve readability.

(cherry picked from commit 8e00de424497d2cc6447c529785efa985bd3383c)
2015-09-30 16:16:45 +02:00
Eelco Dolstra
373000cba6 Blacklist the xen_fbfront kernel module
This gets rid of a 30 second delay during boot. See e.g
https://github.com/coreos/bugs/issues/208.

(cherry picked from commit cab1483a95)
2015-09-28 22:51:49 +02:00
Eelco Dolstra
6d0601d433 Wait for udev after resizing partitions
Otherwise the EC2 boot may panic.

(cherry picked from commit e866840a12)
2015-09-28 22:51:43 +02:00
Eelco Dolstra
2214082073 Test whether EC2 root volume resizing works
(cherry picked from commit f125d194e8)
2015-09-28 22:51:36 +02:00
Eelco Dolstra
323b0e77c7 Make EBS volumes much smaller
Since they're resized on first boot anyway, they don't need to be big.

(cherry picked from commit ab0ddac8f9)
2015-09-28 22:51:31 +02:00
Eelco Dolstra
4e18cdda7f Shut up a KDE warning when a user first logs in
It was complaining about not having write permission to
$HOME/.local/share/user-places.xbel (because .local/share didn't exist
yet).

(cherry picked from commit 1b728846a8)
2015-09-28 15:29:04 +02:00
Eelco Dolstra
724cf98bdf Fix Nix database in generated images
This prevents seeing lots of warnings about missing hashes/sizes in the
database when running "nix-store --verify --check-contents" for the
first time.

(cherry picked from commit 64aed5e78f)
2015-09-28 15:29:00 +02:00
Eelco Dolstra
b5f8225c50 Use make-disk-image.nix for VirtualBox images
(cherry picked from commit b3347287be)
2015-09-28 15:28:55 +02:00
Eelco Dolstra
9f7d8f2b01 Disable the ec2-config test
"amazon-init.nix" is not included in the default AMIs because it
unconditionally runs a nixos-rebuild. Also, the test has never worked
(http://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.ec2-config).

(cherry picked from commit f596f0323f)
2015-09-28 15:28:51 +02:00
Eelco Dolstra
7df65ef2d1 Fix the EC2 test
(cherry picked from commit 412477e914)
2015-09-28 15:28:43 +02:00
Eelco Dolstra
64e7656feb Fix GRUB syntax in EC2 HVM images
There is no "root" command in GRUB 2, and it's not needed anyway. This
command delayed HVM boots for a few seconds.

(cherry picked from commit 640dff2918)
2015-09-28 15:28:39 +02:00
Eelco Dolstra
355b69ebbb ec2-data.nix: Remove superfluous check
(cherry picked from commit 7338f5ff46)
2015-09-28 15:28:34 +02:00
Eelco Dolstra
22d6cf3dbd Update AMI generator
The EBS and S3 (instance-store) AMIs are now created from the same
image. HVM instance-store AMIs are also generated.

Disk image generation has been factored out into a function
(nixos/lib/make-disk-image.nix) that can be used to build other kinds
of images.

(cherry picked from commit e018e10ba64e3277f11f4123bc46fc68def970dd)
2015-09-27 21:10:28 +02:00
Eelco Dolstra
31425d8406 channel.nix: Fix broken flag to skip substitutes
(cherry picked from commit 95a8c49a15a774f64deee2532db3f87e8c8491c9)
2015-09-27 21:10:17 +02:00
Eelco Dolstra
f28cb27fb1 Add filesystem option to automatically grow to the maximum size
This is primarily for EC2 and other cloud environments, where the disk
may be bigger than the original image.

(cherry picked from commit 9d92bd7845)
2015-09-27 21:09:00 +02:00
Eelco Dolstra
1db8195d0c Remove relatime mount option
This has been the kernel default for a long time.

(cherry picked from commit f40c7ed143)
2015-09-27 21:08:55 +02:00
Vladimír Čunát
2756c12cc0 haskell: make ghc, cabal-install, and stack visible
Thanks to @peti. Close #10035.

(cherry picked from commit 6070cd09fc)
2015-09-27 17:23:20 +02:00
aszlig
c512b78f1f
release-notes/15.09: Document changes for vboxsf.
Since 74209a4 we have initial support for the "vboxsf" (VirtualBox
shared folder) file system support. This will be cherry-picked to
release-15.09 so we need to notice people about the change.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 39a03b679a)
2015-09-26 11:08:35 +02:00
aszlig
b6d0e5abe5
release-notes/15.09: Use <option/> for options.
There were quite a few configuration options which were tagged via
<literal/>, so in order to keep consistency with other docbook manuals
in the source tree, let's use <option/> here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 02c2500195)
2015-09-26 11:08:34 +02:00
aszlig
310c30089e
nixos/tests/virtualbox: Don't parallelize VM boot.
I'm not quite sure why the official Hydra gets a kernel panic in one of
two VMs using the exact same kernels:

https://hydra.nixos.org/build/26339384

Because the kernel panic happens before stage 1, let's wait for the
first VM to boot up and after the bootup is done, start the second one
in hope that it won't trigger the panic.

Oddly enough, whenever I run the test on my own Hydra and on my local
machines, I don't get anything like that.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit baf1d1dcd7)
2015-09-26 11:08:34 +02:00
aszlig
e1841ac3ec
nixos/tests/virtualbox: Destroy detectvirt VM.
I forgot to do this in da0e642. It shouldn't be a big problem but it's
more clean to destroy the VM once we're done testing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 764a767d5f)
2015-09-26 11:08:34 +02:00
aszlig
df5fe9b64b
nixos/tests/virtualbox: Give VMs more memory.
We previously had 1024 MB of memory to fit a VirtualBox VM with 512 MB
plus the memory needed of the VirtualBox host VM. That obviously won't
work for two VirtualBox VMs, which are used for testing networking
between two VirtualBox guests.

Now, we have 2048 MB on the qemu guest (the VirtualBox host) and 768 MB
for each VirtualBox guest. That should be enough to fit in two
VirtualBox guests (I hope).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 3e6bb402b1)
2015-09-26 11:08:33 +02:00
aszlig
45be9edaee
nixos/filesystems: Skip check for vboxsf.
We don't even have any means to check a VirtualBox shared folder, so
let's not even try to.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit f9766f885d)
2015-09-26 11:08:33 +02:00
aszlig
b714bd7a1b
nixos/filesystems: Improve vboxsf default options.
The default options for all file systems currently are
"defaults.relatime", which works well on file systems which support the
relatime option.

Unfortunately, this is not the case for the VirtualBox shared folder
filesystem, so until now, you need to set something like:

fileSystems."/foo" = {
  device = "foo";
  fsType = "vboxsf";
  options = "defaults";
};

Otherwise mounting the file system would fail.

Now, we provide only the "defaults" option to the "vboxsf" file system,
so something like this is enough:

fileSystems."/foo" = {
  device = "foo";
  fsType = "vboxsf";
};

An alternative to that could be to document that you need to set default
options, but we really should do what users expect instead of forcing
them to look up the documentation as to why this has failed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit cd4caed35a)
2015-09-26 11:08:33 +02:00
Jaka Hudoklin
32e768770b
virtualbox service: add support for vboxsf guest filesystem
Closes #9358

Signed-off-by: Jaka Hudoklin <jakahudoklin@gmail.com>
Fix reference to bin/mount.vboxsf.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>

(cherry picked from commit 74209a4ca8)
2015-09-26 11:08:32 +02:00
aszlig
4da90c0dbe
tests/virtualbox: Add a subtest for host USB.
Unfortunately, we can't test whether USB is really working, but we can
make sure that VirtualBox has access to the USB devices.

This is essentially testing #9736, which I haven't yet been able to
reproduce though, but it makes sense to test it so it won't happen in
future releases.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 9a39c2e943)
2015-09-26 11:08:32 +02:00
Vladimír Čunát
60aa924d06 doc/release notes (15.09): mention texlive
(cherry picked from commit 48200a96e0)
2015-09-25 14:26:00 +02:00
Eelco Dolstra
7dfdf4dd59 ec2-data.nix: Print all SSH host keys
Also, don't barf if there is no DSA key.

(cherry picked from commit e73b19ae4e)
2015-09-24 15:30:19 +02:00
Eelco Dolstra
fa274e36da ec2-data.nix: Support ed25519 host keys
(cherry picked from commit df665ded7e)
2015-09-24 15:30:17 +02:00
Jan Malakhovski
71b93c799b nixos: show the manual in system's /share/doc (close #9928)
(cherry picked from commit 9cc7859b2e)
2015-09-24 12:32:51 +02:00
Vladimír Čunát
178f4e7753 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.

(cherry picked from commit 76ef7a93e3)
2015-09-23 13:03:12 +02:00
Eelco Dolstra
71c82e8cb1 Update 15.09 release notes
(cherry picked from commit ddb39be324)
2015-09-22 11:15:35 +02:00
Eelco Dolstra
450db3136e gdb: Look for debug info in /run/current-system/sw/lib/debug
The previous default was $out/lib/debug, which wasn't very useful.

This ensures that you can do

  environment.systemPackages = [ pkgs.hello.debug ];

to install debug info.

(cherry picked from commit e636e0a532)
2015-09-22 11:15:10 +02:00
aszlig
17485470cb tests/virtualbox: Add systemd-detect-virt subtest.
Addresses #9876 in the way that we want to make sure that VirtualBox 5.x
is going to be properly detected. Right now the result is "kvm", so the
subtest fails as expected with:

error: systemd-detect-virt returned "kvm" instead of "oracle" at (eval
       14) line 414, <__ANONIO__> line 92.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit da0e642c2b)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-17 17:13:29 +02:00
aszlig
576a1cd792 nixos/virtualbox-image: Use 32MB of video memory.
Booting the demo/installer image won't work if the video memory is too
low. It boots into KDE, shows the background image and doesn't do
anything, according to @domenkozar.

Thanks to @domenkozar for reporting and testing this with 32MB.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 03730319bd)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-17 17:13:25 +02:00
aszlig
c889294b24 nixos/virtualbox-image: Enable PAE on 32bit.
pkgs/os-specific/linux/kernel/common-config.nix defines HIGHMEM64G on
line 441 for 32bit systems, which implies PAE.

We now creating the OVA with PAE support enabled, which fixes bootup of
the image if people are just importing it without setting PAE
explicitly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 4e23f1f908)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-17 17:13:22 +02:00
aszlig
6bdb6383e2 tests/virtualbox: Fix long line in guestAdditions.
This is essentially not only "wrapping" the line but refactoring into a
shorter name which is used in two places.

And yes, I know I'm very pedantic if it comes to whitespaces and line
lengths, but I made sure this doesn't change any functionality:

$ nix-instantiate nixos/tests/virtualbox.nix
...
/nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv
$ git stash pop
...
$ nix-instantiate nixos/tests/virtualbox.nix
...
/nix/store/cldxyrxqvwpqm02cd3lvknnmj4qmblyn-vm-test-run-virtualbox.drv
$

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 17f58275a0)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-17 17:13:19 +02:00
aszlig
f63b79b055 tests/virtualbox: Allow to call it with debug attr.
Instead of manually setting debug to true or false, this should make it
possible to now run the test like this:

nix-build nixos/tests/virtualbox.nix --arg debug true

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 8f98226f50)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-17 17:13:17 +02:00
aszlig
7df9d8d39a tests/virtualbox: Give test machines more memory.
Sometimes there are random kernel panics do to the lack of memory in the
qemu guests, but as we're setting the VirtualBox memory size relatively
low, 1024 MB should be enough for the qemu guests.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 0d4a3ce485)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-16 18:44:59 +02:00
aszlig
84bce4f3e1 tests/virtualbox: Start systemwide DBus in guests.
We want to check whether DBus functionality is working, so let's make
sure it is running in our mini-initrd.

DBus unfortunately requires to have users properly set up and another
configuration file other than in ${dbus.daemon}/etc/dbus-1/system.conf,
so we do provide that as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 7707c7df7f)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-16 18:44:54 +02:00
Mathnerd314
3c559278b4 kmod-debian-aliases: init at 21-1 (close #9669)
(cherry picked from commit 87012187b2)
2015-09-13 18:21:45 +02:00
Luca Bruno
07da766101 nixos containers: fix system path when reloading
(cherry picked from commit 682777ed24)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-11 18:42:46 +02:00
Eelco Dolstra
4da70720a8 nixos-container: Fix show-host-key
We don't generate ecdsa keys by default anymore, so print ed25519
instead if available.

(cherry picked from commit c904dfa87c)
2015-09-11 14:16:16 +02:00
Eelco Dolstra
71861c955c Remove references to /root/test-firmware
This is no longer supported by systemd.

(cherry picked from commit 3ebe5f802b)
2015-09-08 11:30:04 +02:00
obadz
dd3b84561b nixos: environment.pathsToLink += some desktop dirs
Close #9622.
(adding common desktop locations and locations specified in
http://standards.freedesktop.org/menu-spec/1.1/)

(cherry picked from commit afdfe76bbd)
2015-09-07 21:17:42 +02:00
Domen Kožar
b01eebf021 nginx: include mimetypes mapping 2015-09-07 14:43:07 +02:00
Jaka Hudoklin
5a255bb501 kubernetes service: add a few options 2015-09-07 12:50:43 +02:00
Jaka Hudoklin
a8261794c3 openvswitch service: fix ipsec startup order 2015-09-07 12:50:22 +02:00
Jaka Hudoklin
1cf322c9da logstash service: fix tests
(cherry picked from commit 93132d1717)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-06 15:59:56 +02:00
Jaka Hudoklin
fe10eaeef7 logstash service: fix startup
(cherry picked from commit 77356690fb)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-06 15:59:53 +02:00
Jaka Hudoklin
4ab9327fec etcd service: fix tests
(cherry picked from commit a79d732243)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-06 15:59:45 +02:00
William A. Kennington III
deea3309e1 bosun: Move to go-packages 2015-09-05 01:42:02 -07:00
Rickard Nilsson
b05dcea92a bosun,scollector: Fix NixOS modules to use bin attr of go pkgs
(cherry picked from commit ed140ff927)
2015-09-04 21:46:43 +02:00
lethalman
ab063687c2 Merge pull request #9642 from Mathnerd314/power-fix
Remove desktopManagerHandlesLidAndPower
(cherry picked from commit 8bfacda44c)
2015-09-04 18:11:31 +02:00
Eelco Dolstra
959f05dfbb Rename users.extraUsers -> users.users, users.extraGroup -> users.groups
The "extra" part hasn't made sense for years.

(cherry picked from commit 14321ae243)
2015-09-04 15:02:47 +02:00
Eelco Dolstra
a54ce7fcd9 command-not-found: Fix nix-env invocation
(cherry picked from commit c090efb9d8)
2015-09-04 15:02:41 +02:00
Eelco Dolstra
7a89feed0a command-not-found: Use attribute name
(cherry picked from commit 13532ee161)
2015-09-04 15:02:37 +02:00
Eelco Dolstra
d01c55fccc Remove ad hoc README
It's unlikely that people will see this file, so it's kind of
pointless.

(cherry picked from commit 882b2465c2)
2015-09-04 15:02:10 +02:00
Eelco Dolstra
92ee13ce54 Shorten inhibit message
This also makes it consistent with KDE's inhibit message.

(cherry picked from commit f223448d5d)
2015-09-04 15:02:06 +02:00
Ragnar Dahlén
c2d1617b91 docker: Minor improvements, fix failing test
- Replace usage of deprecated CLI flag `--daemon`
- Introduce `storageDriver` option for module
- Fix failing test by using `overlay` storage driver

(cherry picked from commit 9bfe92ecee)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-04 09:55:26 +02:00
Eelco Dolstra
538958bf17 Create /var/log/journal
Fixes #9614.

(cherry picked from commit 6ab7e0de29)
2015-09-03 18:04:26 +02:00
Eelco Dolstra
2f2a4df986 Manual: Document system.autoUpgrade
(cherry picked from commit e70f8c58cc)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-02 19:23:23 +02:00
Eelco Dolstra
9f79592562 If !cfg.mutableUsers, require a password or SSH authorized key
Fixes https://github.com/NixOS/nixpkgs/issues/7308

(cherry picked from commit 6e76765795)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-02 19:22:44 +02:00
Bjørn Forsman
ddc34382d2 nixos: document nvidia legacy driver options
(cherry picked from commit bd84ebaa1e)
2015-09-02 13:26:43 +02:00
Profpatsch
4ea3e12b1a desktopManagerHandlesLidAndPower default false`
Changes the option and explicitely sets it for each desktopManager.

Reasoning: Currently,
services.xserver.displayManager.desktopManagerHandlesLidAndPower is set
to true by default. This creates a problem for users without desktop
environments activated, since lid management simply doesn't work
(and they have to be lucky to find this option).

See issue #9671

(cherry picked from commit 44c12dc0ff)
2015-09-02 06:13:34 +02:00
Vladimír Čunát
9213a2b435 nixos: kill services.virtualboxGuest to fix #9600
(cherry picked from commit 54c4aab662)
2015-09-02 04:55:48 +02:00
Eelco Dolstra
11761d2117 programs.ssh.knownHosts: Use attribute name
This allows writing:

  programs.ssh.knownHosts."10.1.2.3".publicKey = "bar";

instead of

  programs.ssh.knownHosts = [ { hostNames = [ "10.1.2.3" ]; publicKey = "bar"; } ];

(cherry picked from commit f6eece6f8f)
2015-09-01 14:19:33 +02:00
Eelco Dolstra
b023d0dc2c programs.ssh.knownHosts: Use submodule
(cherry picked from commit 7c6ff6c1da)
2015-09-01 14:19:28 +02:00
Eelco Dolstra
d6f69cb3d9 Rename services.openssh.knownHosts -> programs.ssh.knownHosts
This option configures the SSH client, not the server.

(cherry picked from commit 287c08d8a3)
2015-09-01 14:19:23 +02:00
Eelco Dolstra
dc87ca0377 Make proxy test more robust
http://hydra.nixos.org/build/25322489
(cherry picked from commit c839c988f4)
2015-09-01 14:18:30 +02:00
Eelco Dolstra
07c2ffa70d Fix NFSv4 test
http://hydra.nixos.org/build/25349071
(cherry picked from commit ea7b5bb8b0)
2015-09-01 14:18:01 +02:00
Eelco Dolstra
a882eaa168 Fix tests that use the Valgrind docs
(cherry picked from commit 1852e65776)
2015-09-01 14:17:42 +02:00
Vladimír Čunát
95e761660b desktop and xmonad wrappers: preferLocalBuild
Also no substitution.

(cherry picked from commit b92c4a51e6)
2015-09-01 09:44:08 +02:00
Eelco Dolstra
13715ccddb Revert "Apache service module: allow compression"
This reverts commit 164f6ff2a8 per
https://github.com/NixOS/nixpkgs/pull/9407#issuecomment-134523359
(it's too site-specific). Furthermore this should be an option at the
virtual host level.

(cherry picked from commit 9d82f7e53e)
2015-08-28 20:55:20 +02:00
Eelco Dolstra
7e3a8b382a Rename rl-unstable.xml -> rl-1509.xml
(cherry picked from commit d4ccd68648)
2015-08-28 20:54:35 +02:00
Jascha Geerds
db542ceecf cups: Fix printing test
(cherry picked from commit ab70c601b6)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-08-27 09:37:31 +02:00
Domen Kožar
f8785253d7 set the channel and commit count in the release 2015-08-27 00:25:31 +02:00
Boris Sukholitko
ae80c3e7bc containers: fix interfaces option bugs
The default should be [], no need to check it for INTERFACES
variable.
2015-08-26 22:11:12 +03:00
Eelco Dolstra
1e18b75170 Prefer local build for the test driver script 2015-08-26 15:04:47 +02:00
lethalman
a45a0911d4 Merge pull request #9376 from rick68/softether
softether: support SoftEther VPN 4.18
2015-08-26 10:45:46 +02:00
lethalman
d025500186 Merge pull request #9383 from anderspapitto/master
also generate startAt timers for systemd user units
2015-08-26 10:42:44 +02:00
lethalman
3aed00d593 Merge pull request #9395 from bosu/cont-ifaces
containers: add interfaces config option.
2015-08-26 10:41:21 +02:00
lethalman
207f51a5e1 Merge pull request #9439 from noqqe/master
fixed: mlmmj-recieve: No such file or directory
2015-08-25 15:37:42 +02:00
Florian Baumann
d43496300e fixed: mlmmj-recieve: No such file or directory 2015-08-25 15:27:58 +02:00
Eelco Dolstra
aa3b13549f Grmbl
http://hydra.nixos.org/build/24983009
2015-08-25 11:26:38 +02:00
Eelco Dolstra
87789ac39d Hide services.dbus.enable
Realistically, you can't disable D-Bus on a modern system.
2015-08-25 11:07:31 +02:00
Wout Mertens
660cafe69a Merge pull request #9407 from wmertens/apache-deflate
Apache service module: allow compression
2015-08-25 07:36:27 +02:00
Eelco Dolstra
e4610f2965 buildEnv: Support package priorities like nix-env
This gets rid of a bunch of collision warnings.
2015-08-25 00:40:40 +02:00
Eelco Dolstra
9c61317002 Put all firmware in $out/lib/firmware
This way, hardware.firmware can be a list of packages.
2015-08-25 00:40:34 +02:00
Eelco Dolstra
779e585549 chromium: Fix test on i686-linux
http://hydra.nixos.org/build/24982682
2015-08-24 11:05:01 +02:00
Wout Mertens
164f6ff2a8 Apache service module: allow compression 2015-08-23 15:13:52 +02:00
Charles Strahan
648973d641 nixos: rename service 'ubuntu-fan' as 'fan' 2015-08-22 14:05:35 -04:00
Boris Sukholitko
77c49d9333 containers: add interfaces config option.
It uses systemd-nspawn's --network-interface to move
existing interfaces into the container.
2015-08-22 13:03:07 +03:00
Jaka Hudoklin
46203a790d kubernetes service: fix option conversion 2015-08-21 20:55:40 +02:00
Anders Papitto
57f7798b51 also generate startAt timers for systemd user units 2015-08-20 23:46:08 -07:00
Wei-Ming Yang
efd34824eb softether: support SoftEther VPN 4.18 2015-08-21 13:59:00 +08:00
Peter Simons
ab6c8643d4 nix-gc.nix: prefer "nix-store" over "nix-collect-garbage" because the latter supports "--max-freed"
Works around https://github.com/NixOS/nix/issues/609.
2015-08-20 22:56:41 +02:00
Eelco Dolstra
d1c30dc5aa Give the chromium test more memory
Hopefully fixes random failures like

http://hydra.nixos.org/build/24861987/nixlog/446
2015-08-20 20:34:35 +02:00
Eelco Dolstra
401782cb67 Revert "openssh: 6.9p1 -> 7.0p1"
This reverts commit a8eb2a6a81. OpenSSH
7.0 is causing too many interoperability problems so soon before the
15.08 release.

For instance, it causes NixOps EC2 initial deployments to fail with
"REMOTE HOST IDENTIFICATION HAS CHANGED". This is because the client
knows the server's ssh-dss host key, but this key is no longer
accepted by default. Setting "HostKeyAlgorithms" to "+ssh-dss" does
not work because it causes ssh-dss to be ordered after
"ecdsa-sha2-nistp521", which the server also offers. (Normally, ssh
prioritizes host key algorithms for which the client has a known host
key, but not if you set HostKeyAlgorithms.)
2015-08-20 14:08:18 +02:00