ts468
2b284a3d1d
Merge pull request #8833 from ts468/upstream.xen
...
xen: fixes (authored by michalpalka)
2015-08-01 16:59:40 +02:00
Eelco Dolstra
65700b435c
Use ConditionVirtualization to disable some services in containers
...
(cherry picked from commit c52a983806
)
2015-07-22 12:23:40 +02:00
Mateusz Kowalczyk
23187c3431
docker: allow the user to override postStart
...
My use-case: passing -H SOM.EIP.ADD.RES:PORT doesn't result in a .sock
file so the service would never go up.
2015-07-20 14:28:49 +01:00
Thomas Strobel
2ff9129337
xen: fixes (authored by michalpalka)
...
Xen required a few changes in order to be usable:
* Include xenfs module in initrd as loading it in the activation
script was failing.
* Include /etc/default/xendomains, which is needed by
xen-domains service.
* Create /var/log/xen and /var/lib/xen directories in
the xen-store service, which are needed by the xl command.
The directories could be created by any other script as long as
they are guaranteed to exist before xl is called.
* Fix a reference to /bin/ls in the xendomains script.
2015-07-15 12:38:37 +02:00
Luca Bruno
6c8e6aaa24
nixos docker: fix service and test
2015-07-05 13:57:23 +02:00
Mateusz Kowalczyk
2bd811155e
Merge pull request #8603 from ts468/upstream.xen
...
Xen related stuff
2015-07-04 16:13:33 +01:00
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
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
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