Thomas Strobel
8f911263e9
Xen Dom0: add dnsmasq to xen-bridge.
2015-07-02 16:27:40 +02:00
Eelco Dolstra
96b325b0b7
Remove option ec2.metadata
2015-06-30 17:25:56 +02:00
Eelco Dolstra
32b9ca3219
EC2: Don't blackhole 169.254.169.254
...
https://github.com/NixOS/nixops/issues/267
2015-06-30 17:04:19 +02:00
William A. Kennington III
fee9ef8659
nixos: Replace pkgs.openssh with config.programs.ssh.package
2015-06-26 17:09:58 -07:00
Arseniy Seroka
cf44a27fc4
fix argument in mkEnableOption
2015-06-21 18:21:21 +03:00
Eelco Dolstra
f93d8425c3
Installer test: Fix booting from SCSI
...
This is required by the GRUB 1 test.
2015-06-17 15:47:43 +02:00
Dan Peebles
ebde5fd9d4
Use the right nix when doing things in our amazoninit
2015-06-13 21:26:50 -04:00
Thomas Strobel
399b549611
Fix: xen-bridge systemd service
2015-06-12 12:52:14 +02:00
Thomas Strobel
a6e12c23fc
Link Xen scripts to /etc/xen
2015-06-12 12:52:14 +02:00
Dan Peebles
4b758e374e
Initial attempt at configuring from EC2 userdata (with input from cstrahan). Now with VM tests!
2015-06-11 23:16:35 -04:00
Eelco Dolstra
d906939e74
Installer tests: Don't use the ISO
...
We already have separate tests for checking whether the ISO boots
correctly, so it's not necessary to do that here. So now
tests/installer.nix just tests nixos-install, from a regular NixOS VM
that uses the host's Nix store. This makes running the tests more
convenient because we don't have to build a new ISO after every
change.
2015-06-10 15:28:56 +02:00
Wout Mertens
0666ee4739
Merge pull request #6732 from oconnorr/master
...
Use mktemp to create temporary files to hold ssh host keys and authorized keys
2015-06-02 20:34:43 +02:00
William A. Kennington III
aa5d6922c5
Revert "Set boot.loader.grub.configurationLimit to 1 for gce/azure/amazon images. Setting to 0 results in empty grub config."
...
The issue was that grub was not building the default entry which would
leave systems unbootable. This can now be safely reverted as the default
entry is being built once again.
This reverts commit fd1fb0403c
.
2015-05-29 13:26:51 -07:00
Russell O'Connor
29b7d76ec8
Remove use of && in fetch-ssh-keys service.
...
Scripts are run with -e so will abort when a command fails.
2015-05-29 19:53:58 +00:00
Russell O'Connor
4744e3541a
[GCE] Put temp files for fetch-ssh-keys service in /run
2015-05-29 19:53:57 +00:00
Russell O'Connor
1badfabc4d
Use mktemp to create temporary files to hold ssh host keys and authorized keys when downloading them from the metadata server.
2015-05-29 19:53:57 +00:00
Rob Vermaas
fd1fb0403c
Set boot.loader.grub.configurationLimit to 1 for gce/azure/amazon images. Setting to 0 results in empty grub config.
2015-05-29 19:36:16 +00:00
Ian-Woo Kim
ae2279bcdb
nixos-containers: bindMounts: change default to readOnly. use EXTRA_NSPAWN_FLAGS
2015-05-26 13:41:31 +00:00
Ian-Woo Kim
4d551227c9
nixos-container: rename extraBinds to bindMounts and use attribute set format.
2015-05-26 11:56:42 +00:00
Mateusz Kowalczyk
1113efec5e
Merge pull request #7559 from offlinehacker/openvswitch/ipsec
...
openvswitch: ipsec support
2015-05-26 11:26:02 +01:00
Mateusz Kowalczyk
4fd0f2cf4d
Merge pull request #7558 from offlinehacker/nixos/docker/typefix
...
nixos/docker: set extraOptions to separatedString type
2015-05-26 11:22:50 +01:00
Mateusz Kowalczyk
002c687edf
nova-image: Delete no longer used comment
2015-05-26 11:05:52 +01:00
Mateusz Kowalczyk
0d454d863f
Merge pull request #7876 from rzetterberg/issue-7869
...
nixos: Fixes eval and build error of nova image builder
2015-05-26 11:05:06 +01:00
Ian-Woo Kim
c4f66eb85d
unify extraBindsRW/RO into extraBinds. Now arbitrary mount point is supported.
2015-05-25 19:09:53 +00:00
Ian-Woo Kim
cac38c8664
extraBindsRO/extraBindsRW
2015-05-24 16:31:59 +00:00
Evgeny Egorochkin
8ed3ab50ea
azure-image: common: add sg3_utils
2015-05-20 13:25:01 +03:00
Evgeny Egorochkin
2fe9084397
azure-image: fix, split into bootstrap and regular configurations
...
Conflicts:
nixos/modules/virtualisation/azure-image.nix
2015-05-20 13:24:38 +03:00
Bjørn Forsman
db991a4024
nixos/libvirtd: remove --verbose flag
...
Because it spams the log:
.libvirtd-wrapp[1950]: OBJECT_UNREF: obj=0x7f5d900b4200
.libvirtd-wrapp[1950]: EVENT_POLL_UPDATE_HANDLE: watch=874 events=13
.libvirtd-wrapp[1950]: OBJECT_UNREF: obj=0x7f5d900b4200
.libvirtd-wrapp[1950]: EVENT_POLL_RUN: nhandles=24 timeout=-1
.libvirtd-wrapp[1950]: EVENT_POLL_DISPATCH_HANDLE: watch=874 events=1
.libvirtd-wrapp[1950]: OBJECT_REF: obj=0x7f5d900b4200
.libvirtd-wrapp[1950]: [137B blob data]
2015-05-20 12:14:18 +02:00
Bjørn Forsman
3d2d78cb39
nixos/libvirtd: add 'extraOptions' option
...
And move the '--verbose' flag to extraOptions, so that users can easily
disable it.
2015-05-20 12:14:18 +02:00
Richard Zetterberg
bd5011fc34
Fixes eval and build error of nova image builder
2015-05-17 20:55:07 +02:00
Jussi Maki
6a0d21eb86
VMWare guest support and open-vm-tools package
2015-05-15 12:43:21 +02:00
Rob Vermaas
650d3f8fc4
Revert restartIfChanged on fetch-ec2-data, as it breaks deployments that set ec2.metadata = true, as the existing (default) blackhole will not be cleared.
...
(cherry picked from commit ccf672ca6b055e5e862e45b65d122754c16cf7d1)
2015-05-07 08:51:38 +00:00
Eelco Dolstra
4239e276ea
fetch-ec2-data: Don't restart
...
This service only needs to run once on system startup, so it doesn't
need to be restarted by switch-to-configuration.
2015-05-04 16:56:46 +02:00
Rob Vermaas
ad0bd73775
Work around infinite recursion issue in nixops.
2015-04-29 09:55:20 +00:00
Jaka Hudoklin
ec6ecce8cf
nixos/openvswitch: add ipsec gre tunnels support
2015-04-25 15:35:02 +02:00
Jaka Hudoklin
d6660af8ac
nixos/docker: set extraOptions to separatedString type
...
This change is needed if you want to pass extraOptions to docker in multiple
nixos modules.
2015-04-25 15:25:15 +02:00
Eelco Dolstra
bad3211893
Disable some more unnecessary stuff in containers
2015-04-20 11:32:28 +02:00
Eelco Dolstra
1cb5583c05
container.nix -> docker-container.nix
2015-04-19 22:06:45 +02:00
Nicolas B. Pierron
9647a72835
Fix amazon default configuration.nix file.
2015-04-09 22:18:13 +02:00
Nicolas B. Pierron
6de931a0f8
Merge rename.nix changes.
2015-04-03 23:12:12 +02:00
William A. Kennington III
4868649f03
nixos/initrd: Generic library copying
2015-03-28 18:37:29 -07:00
Rob Vermaas
cbb14299c9
GCE image: Remove some unnecessary lib prefixes.
2015-03-26 09:15:09 +00:00
Rob Vermaas
80202fbd25
GCE image: Add some recommended sysctl settings. Disable OS level firewall by default for GCE images (GCE provides external firewall). Disable passwordAuthentication. Related to issue #6991 .
2015-03-26 09:09:40 +00:00
lethalman
70b059fb59
Merge pull request #5936 from j-keck/nixos-container-usage
...
nixos-container: add missing 'nixos-container update' in usage
2015-03-17 12:43:29 +01:00
Shea Levy
3177d37652
Fix import using module args
2015-03-12 23:42:57 +01:00
Kirill Elagin
356810b178
cupsd: rename cupsd.service
to cups.service
2015-03-12 09:00:56 +03:00
Eelco Dolstra
9bb586943a
Deal with virtualisation.xen.stored in a more standard way
2015-03-05 12:46:50 +01:00
Luca Bruno
b93e8bab3a
nixos/xen: do not use derivation in the default values
...
The xen package is broken on i686, so this would break the generation
of the nixos manual.
2015-03-04 12:05:58 +01:00
Eelco Dolstra
307064ceb5
Don't use machinectl to shut down containers
...
If the host is shutting down, machinectl may fail because it's
bus-activated and D-Bus will be shutting down. So just send a signal
to the leader process directly.
Fixes #6212 .
2015-02-28 19:23:00 +01:00
Jaka Hudoklin
6dc0938a3e
Merge pull request #6591 from lseppala/master
...
Fix rebooting containers where resolv.conf is a symlink
2015-02-28 12:19:01 +01:00
Joachim Fasting
0473b4ae8d
nixos: citerefentry markup in lxc option descriptions
2015-02-28 09:21:48 +01:00
Lane Seppala
4106a3b74e
Fix rebooting containers where resolv.conf is a symlink
2015-02-27 10:27:18 -07:00
Eelco Dolstra
22d2fc3657
Fix "systemctl reload container@"
...
Fixes #5179 .
2015-02-27 14:32:54 +01:00
Rob Vermaas
24e0565407
Only start fetch-keys for GCE image after ip-up.
2015-02-27 10:48:15 +00:00
Rob Vermaas
e4928b8955
GCE image: Pass header to metadata service calls.
2015-02-26 19:20:43 +00:00
Thomas Strobel
3d4fbb874c
Update: add new Xen versions + update NixOS Xen modules
...
Versions of XEN:
- Xen 4.5
- Xen 4.5 + XenServer patches
- Xen 4.4.1
2015-02-25 23:30:44 +01:00
Bjørn Forsman
97875ac175
bridge-utils: align attrname with pkgname
2015-02-20 22:30:51 +01:00
Eelco Dolstra
4ac280ec49
Blacklist the nouveau driver on EC2
2015-02-18 13:04:10 +01:00
James Cook
6daf9aa922
Merge pull request #5995 from ts468/qemu-vm
...
Update QEMU Nixos Virtual Machine
2015-02-16 13:13:26 -08:00
Thomas Strobel
80afabd5b5
Update QEMU Nixos Virtual Machine
...
The Nixos Qemu VM that are used for VM tests can now start without
boot menu even when using a bootloader.
The Nixos Qemu VM with bootloader can emulate a EFI boot now.
2015-02-16 20:07:42 +01:00
Evgeny Egorochkin
4621f16b34
azure: add a job to download ssh host and root keys if they are made available via "custom data"; see #3986
2015-02-16 16:54:30 +02:00
Rob Vermaas
824fccd3e9
Move amazon option out of amazon-image.nix, needed to make ec2.hvm usable from nixops, without breaking evaluation for other backends.
...
(cherry picked from commit 213fe8427c5ce455b893c0c5c56cc38175bf36b7)
2015-02-16 09:57:19 +00:00
Eelco Dolstra
378006f0f2
Restrict the length of container names
2015-01-28 16:13:00 +01:00
Jaka Hudoklin
2af3ff52c2
nixos/containers: make containers in containers possible
2015-01-28 16:06:44 +01:00
j-keck
611a21a919
nixos-container: add missing 'nixos-container update' in usage
...
* in nixos-container.pl the mode 'update' is missing in the usage
2015-01-24 20:37:55 +01:00
Eelco Dolstra
efa8fc2b0a
Paranoia
2015-01-15 18:37:55 +01:00
Eelco Dolstra
3ca275d7ba
NixOS containers: Create /root with 700 permission
...
Systemd-nspawn creates /root with 755 permission if it doesn't exist,
which is bad. So we have to create it ourselves before calling
systemd-nspawn.
2015-01-15 17:51:43 +01:00
Rob Vermaas
df7923fa82
Merge pull request #5515 from oconnorr/master
...
GCE updates to ntp server and to fetch all ssh keys
2015-01-14 13:19:38 +01:00
mokasin
dd6dfde575
Add auto-start option to containers.
2015-01-12 18:26:22 +01:00
Russell O'Connor
d1a58ef7c6
google-compute-image.nix: Try to download all SSH host keys from metadata server.
2015-01-06 12:06:54 -05:00
Russell O'Connor
3251948029
Generate SSH host public key from the private key.
2015-01-05 15:20:55 -05:00
Russell O'Connor
d1cbbff1e3
Call wget directly in fetch-ssh-keys service.
2015-01-05 15:20:55 -05:00
Russell O'Connor
6382e16014
google-compute-image.nix: unconditionally clean up /root/key.pub /root/authorized-keys-metadata
2015-01-05 15:18:02 -05:00
Russell O'Connor
b19ab1f046
google-comute-image.nix: set umask 077 when downloading private keys from the metadata server.
2015-01-05 15:01:49 -05:00
Russell O'Connor
e548a4330d
google-compute-image.nix: use internal google NTP server.
2015-01-05 12:45:23 -05:00
Rob Vermaas
ea9530b5c7
Fix GCE image build.
...
(cherry picked from commit 98af87cd4abb0cd77e8a51cfdf6913a92d088784)
2015-01-05 09:35:35 +01:00
Tobias Geerinckx-Rice
c64257b8e5
Fix user-facing typos (mainly in descriptions)
2014-12-30 03:31:03 +01:00
Mathijs Kwik
6e728a42ec
virtualisation.qemuNetworkingOptions -> virtualisation.qemu.networkingOptions
2014-12-19 11:59:00 +01:00
Mathijs Kwik
6cdacdd4a2
nixos/qemu-vm: make networking options configurable
2014-12-19 08:52:06 +01:00
Jaka Hudoklin
4be1089781
nixos: move kubernetes & fleet to services/cluster
2014-12-11 23:32:37 +01:00
Jaka Hudoklin
deb28cf0b1
nixos: container tarball release
...
- Create container nixos profile
- Create lxc-container nixos config using container nixos profile
- Docker nixos image, use nixos profile for its base config
2014-12-11 23:17:27 +01:00
Jaka Hudoklin
c821f239a3
nixos/fleet: fix typo
2014-12-08 13:30:45 +01:00
Jaka Hudoklin
743b47579b
nixos/fleet: enable etcd and docker by default
2014-12-08 13:07:12 +01:00
Jaka Hudoklin
b7092dc95c
nixos: add fleet module
2014-12-07 21:52:52 +01:00
Domen Kožar
55cf272c19
fixes #5198
2014-12-02 12:59:14 +01:00
Jaka Hudoklin
40d73c5eb7
nixos/docker: fix module, add simple test
2014-12-01 17:20:35 +01:00
Jaka Hudoklin
2b261c1edf
nixos: add kubernetes module
2014-11-29 02:27:17 +01:00
aszlig
444987193e
nixos: Rename virtualbox to virtualboxGuest.
...
Especially new users could be confused by this, so we're now marking
services.virtualbox.enable as obsolete and defaulting to
services.virtualboxGuest.enable instead. I believe this now makes it
clear, that this option is for guest additions only.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-27 18:42:22 +01:00
Aristid Breitkreuz
5ff169f4d7
containers: remove obsolete comment
2014-11-23 12:30:03 +01:00
Vladimír Čunát
b4af993c3f
Merge branch 'master' into staging
...
Conflicts (simple):
pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
Michael Raskin
232f6bb4d2
Merge pull request #4929 from abbradar/prl-tools
...
Add packages and support for Parallel Guest Tools
2014-11-13 00:22:42 +03:00
Michael Raskin
efe5eb4709
Merge pull request #4573 from fpletz/feature/lxc-configuration
...
Add support for global LXC config files
2014-11-13 00:14:46 +03:00
Nikolay Amiantov
32e18bc722
nixos/parallels-guest: add options
2014-11-12 01:26:23 +03:00
Luca Bruno
83221f3886
Merge branch 'master' into staging
...
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Jaka Hudoklin
53667c7b1a
Merge pull request #4870 from bosu/docker-proxy
...
docker: propagate nix.proxy into daemon environment
2014-11-08 13:06:56 +01:00
Boris Sukholitko
0d89afdedd
docker: propagate nix.proxy into daemon environment
2014-11-07 13:46:36 +02:00
Vladimír Čunát
52404a868d
Merge recent master into staging
...
Nixpkgs Hydra: ?compare=1157272
TODO: port e22889064f
Conflicts:
nixos/tests/gnome3_10.nix (auto-solved)
pkgs/applications/video/aegisub/default.nix
pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
aszlig
8e516de3e7
nixos: Fix priorities of initialHashedPassword.
...
Regression introduced in f496c3cbe4
.
Previously when we used security.initialRootPassword, the default
priority for this option was 1001, because it was a default value set by
the option itself.
With the mentioned commit, it is no longer an option default but a
mkDefault, which is priority 1000.
I'm setting this to 150 now, as test-instrumentation.nix is using this
for overriding other options and because I think it still makes it
possible to simple-override it, because if no priority is given, we get
priority 100.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-04 05:19:07 +01:00
Eelco Dolstra
f496c3cbe4
Obsolete security.initialPassword
...
You can now set users.extraUsers.root.initialHashedPassword instead.
2014-11-03 12:36:56 +01:00
Franz Pletz
2c321bf296
Add support for global LXC config files
2014-10-18 05:02:39 +02:00