summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* Merge pull request #7559 from offlinehacker/openvswitch/ipsecMateusz Kowalczyk2015-05-26
|\ | | | | openvswitch: ipsec support
| * nixos/openvswitch: add ipsec gre tunnels supportJaka Hudoklin2015-04-25
| |
| * nixos: add racoon ipsec IKE deamonJaka Hudoklin2015-04-25
| |
* | Merge pull request #7558 from offlinehacker/nixos/docker/typefixMateusz Kowalczyk2015-05-26
|\ \ | | | | | | nixos/docker: set extraOptions to separatedString type
| * | nixos/docker: set extraOptions to separatedString typeJaka Hudoklin2015-04-25
| |/ | | | | | | | | This change is needed if you want to pass extraOptions to docker in multiple nixos modules.
* | Merge pull request #7566 from offlinehacker/nixos/node-docker-registry/moduleMateusz Kowalczyk2015-05-26
|\ \ | | | | | | nixos: add node docker registry server
| * | nixos: add node docker registry serverJaka Hudoklin2015-04-25
| |/
* | nova-image: Delete no longer used commentMateusz Kowalczyk2015-05-26
| |
* | Merge pull request #7876 from rzetterberg/issue-7869Mateusz Kowalczyk2015-05-26
|\ \ | | | | | | nixos: Fixes eval and build error of nova image builder
| * | Fixes eval and build error of nova image builderRichard Zetterberg2015-05-17
| | |
* | | Merge pull request #7998 from dezgeg/pr-ddclient-ssllethalman2015-05-26
|\ \ \ | | | | | | | | ddclient: Set SSL_CERT_FILE environment variable
| * | | ddclient: Set SSL_CERT_FILE environment variableTuomas Tynkkynen2015-05-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise connection to SSL hosts fails like this: May 26 06:44:05 kbuilder ddclient[17084]: WARNING: cannot connect to dynamicdns.park-your-domain.com:443 socket: IO::Socket::IP configuration failed SSL connect attempt failed with unknown error error:14090086:SSL routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed
* | | | nixos/grub: Fix assertionWilliam A. Kennington III2015-05-25
| | | |
* | | | nixos/installer: Make test install disk larger to support the expressionsWilliam A. Kennington III2015-05-25
| | | |
* | | | nixos/grub: Add the ability to mirror grub to multiple partitionsWilliam A. Kennington III2015-05-25
| | | |
* | | | Merge pull request #7643 from Shados/fix-grub-efi-onlyWilliam A. Kennington III2015-05-25
|\ \ \ \ | | | | | | | | | | grub2: Fix EFI-only installation
| * | | | grub module: removed invalid device check for grub EFI installationAlexei Robyn2015-04-30
| | | | |
* | | | | Trackpoint scrolling on T450s et alAristid Breitkreuz2015-05-25
| | | | |
* | | | | Added config options for systemd-coredump functionality.Jonathan Glines2015-05-24
| | | | |
* | | | | Merge pull request #7941 from peti/allow-custom-ssh-moduli-filePeter Simons2015-05-22
|\ \ \ \ \ | | | | | | | | | | | | nixos: add config.services.openssh.moduliFile option so that users can replace the default file from OpenSSH
| * | | | | nixos: add config.services.openssh.moduliFile option so that users can ↵Peter Simons2015-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replace the default file from OpenSSH The man page for ssh-keygen(1) has a section "MODULI GENERATION" that describes how to generate your own moduli file. The following script might also be helpful: | #! /usr/bin/env bash | | moduliFiles=() | | generateModuli() | { | ssh-keygen -G "moduli-$1.candidates" -b "$1" | ssh-keygen -T "moduli-$1" -f "moduli-$1.candidates" | rm "moduli-$1.candidates" | } | | for (( i=0 ; i <= 16 ; ++i )); do | let bitSize="2048 + i * 128" | generateModuli "$bitSize" & | moduliFiles+=( "moduli-$bitSize" ) | done | wait | | echo >moduli "# Time Type Tests Tries Size Generator Modulus" | cat >>moduli "${moduliFiles[@]}" | rm "${moduliFiles[@]}" Note that generating moduli takes a long time, i.e. several hours on a fast machine! This patch resolves https://github.com/NixOS/nixpkgs/pull/5870.
* | | | | | Merge pull request #7878 from dezgeg/pr-extlinuxviric2015-05-22
|\ \ \ \ \ \ | | | | | | | | | | | | | | generic-extlinux-compatible: Add new bootloader for ARM
| * | | | | | generic-extlinux-compatible: Add new bootloader for ARMTuomas Tynkkynen2015-05-17
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This module generates a /boot/extlinux/extlinux.conf bootloader configuration file that is supported by e.g. U-Boot: http://git.denx.de/?p=u-boot.git;a=blob;f=doc/README.distro;hb=refs/heads/master With this, all ARM boards supported by U-Boot can be booted in a common way (a single boot file generator, all boards booting via initrd like x86) and with same boot menu functionality as GRUB has. -- sample extlinux.conf file -- # Generated file, all changes will be lost on nixos-rebuild! # Change this to e.g. nixos-42 to temporarily boot to an older configuration. DEFAULT nixos-default TIMEOUT 50 LABEL nixos-default MENU LABEL NixOS - Default LINUX ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-zImage INITRD ../nixos/0ss2zs8sb6d1qn4gblxpwlxkfjsgs5f0-initrd-initrd FDTDIR ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-dtbs APPEND systemConfig=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M init=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M/init loglevel=8 console=ttyS0,115200n8 drm.debug=0xf LABEL nixos-71 MENU LABEL NixOS - Configuration 71 (2015-05-17 21:32 - 15.06.git.0b7a7a6M) LINUX ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-zImage INITRD ../nixos/0ss2zs8sb6d1qn4gblxpwlxkfjsgs5f0-initrd-initrd FDTDIR ../nixos/n7vxfk60nb5h0mcbhkwwxhcz2q2nvxzv-linux-4.1.0-rc3-cpufreq-dtbs APPEND systemConfig=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M init=/nix/store/469qvr43ln8bfsnk5lzcz6m6jfcgdd4r-nixos-15.06.git.0b7a7a6M/init loglevel=8 console=ttyS0,115200n8 drm.debug=0xf
* | | | | | nixos/tests/chromium: Detect popup using OCR.aszlig2015-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make the test a lot more reliable, because we no longer need to press ESC multiple times hoping that it will close the popup. Unfortunately in order to run this test I needed to locally revert the gyp update from a305e6855dd8723683c77635f45ae28411c8f36c. With the old gyp version however the test runs fine and it's able to properly detect the popup. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | | nixos/test-driver: Fix bashism in Machine.pm.aszlig2015-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to @bjornfor for the note. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | | nixos/testing: Use stripped down tesseract only.aszlig2015-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only include the English language for the VM tests, because we most likely won't need other languages. At least for now. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | | nixos/test-driver: Make tesseract OCR optional.aszlig2015-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default this is now enabled, and it has to be explicitely enabled using "enableOCR = true". If it is set to false, any usage of getScreenText or waitForText will fail with an error suggesting to pass enableOCR. This should get rid of the rather large dependency on tesseract which we don't need for most tests. Note, that I'm using system("type -P") here to check whether tesseract is in PATH. I know it's a bashism but we already have other bashisms within the test scripts and we also run it with bash, so IMHO it's not a problem here. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | | nixos/tinc: users are system usersWilliam A. Kennington III2015-05-21
| | | | | |
* | | | | | nixos/lightdm: More changesWilliam A. Kennington III2015-05-21
| | | | | |
* | | | | | nixos/tests/luksroot: Switch to use waitForText.aszlig2015-05-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the "blindly hope that 60 seconds is enough" issue from 1f34503, so that we now have a (hopefully) reliable way to wait for the passphrase prompt. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | | nixos/test-driver: Add new waitForText function.aszlig2015-05-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As promised in the previous commit, this can be used similarly to $machine->waitForWindow, where you supply a regular expression and it's retrying OCR until the regexp matches. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | | nixos/test-driver: Add new getScreenText function.aszlig2015-05-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically, this creates a screenshot and throws tesseract at it to recognize the characters from the screenshot. In order to produce a result that is well enough, we're using lanczos scaling and scale the image up to 400% of its original size. This provides the base functionality for a new Machine method which will be called waitForText. I originally had that idea long ago when writing the VM tests for VirtualBox and Chromium, but thought it would be disproportionate to the case. The downside however is that VM tests now depend on tesseract, but given the average runtime of our tests it really shouldn't have a too big impact and it's only a runtime dependency after all. Another issue is that the OCR process takes quite some time to finish, but IMHO it's better (as in more deterministic) than to rely on sleep(). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | | Merge pull request #7857 from rushmorem/marathon-module-updateArseniy Seroka2015-05-21
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Update Marathon module
| * | | | | Update Marathon modulerushmorem2015-05-21
| |/ / / / | | | | | | | | | | | | | | | | | | | | The new module makes it possible to pass extra commandline arguments to Marathon as well as environment variables.
* | | | | nixos/release: Add luksroot test to "tested" job.aszlig2015-05-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to avoid getting broken LUKS systems into the latest channel, so let's ensure that the channel update won't happen if LUKS support is broken again. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | nixos/tests/installer: Add test for LUKS rootfs.aszlig2015-05-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This serves as a regression test for #7859. It's pretty straightforward, except from the fact that nixos-generate- config doesn't detect LUKS devices and the "sleep 60". As for the former, I have tried to add support for LUKS devices for nixos-generate-config, but it's not so easy as it sounds, because we need to create a device tree across all possible mappers and/or LVM up to the "real" device and then decide whether it is relevant to what is currently mounted. So I guess this is something for the nixpart branch (see #2079). And the latter isn't very trivial as well, because the LUKS passphrase prompt is issued on /dev/console, which is the last "console=..." kernel parameter (thus the `mkAfter`). So we can't simply grep the log, because the prompt ends up being on one terminal only (tty0) and using select() on $machine->{socket} doesn't work very well, because the FD is always "ready for read". If we would read the FD, we would conflict with $machine->connect and end up having an inconsistent state. Another idea would be to use multithreading to do $machine->connect while feeding the passphrase prompt in a loop and stop the thread once $machine->connect is done. Turns out that this is not so easy as well, because the threads need to share the $machine object and of course need to do properly locking. In the end I decided to use the "blindly hope that 60 seconds is enough" approach for now and come up with a better solution later. Other VM tests surely use sleep as well, but it's $machine->sleep, which is bound to the clock of the VM, so if the build machine is on high load, a $machine->sleep gets properly delayed but the timer outside the VM won't get that delay, so the test is not deterministic. Tested against the following revisions: 5e3fe39: Before the libgcrypt cleanup (a71f78a) that broke cryptsetup. 69a6848: While cryptsetup was broken (obviously the test failed). 15faa43: After cryptsetup has been switched to OpenSSL (fd588f9). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | nixos/tests/installer: Allow pre-boot commands.aszlig2015-05-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These commands will be executed directly after the machine is created, so it gives us the chance to for example type in passphrases using the virtual keyboard. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | nixos/tests/installer: Allow to pass extra config.aszlig2015-05-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're going to need it for installer tests where nixos-generate-config isn't yet able to fully detect the filesystems/hardware. for example for device mapper configurations other than LVM. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | nixos/bird: Fix doc compilationWilliam A. Kennington III2015-05-20
| | | | |
* | | | | nixos/lightdm: Some fixupsWilliam A. Kennington III2015-05-20
| | | | |
* | | | | Merge pull request #7860 from Lassulus/birdArseniy Seroka2015-05-21
|\ \ \ \ \ | | | | | | | | | | | | nixos: add bird module
| * | | | | nixos: add bird modulelassulus2015-05-19
| | | | | | | | | | | | | | | | | | | | | | | | patch bird to look in /var/run for birc.ctl
* | | | | | Document the nixpkgs-channels repoEelco Dolstra2015-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces update-channel-branches.sh with standard Git invocations.
* | | | | | nixos-checkout: Add nixpkgs-channels as a remoteEelco Dolstra2015-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way, you can do things like git checkout channels/nixos-14.12 to get the latest tested and built version of NixOS.
* | | | | | azure-image: common: add sg3_utilsEvgeny Egorochkin2015-05-20
| | | | | |
* | | | | | azure-image: fix, split into bootstrap and regular configurationsEvgeny Egorochkin2015-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: nixos/modules/virtualisation/azure-image.nix
* | | | | | nixos/libvirtd: remove --verbose flagBjørn Forsman2015-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
* | | | | | nixos/libvirtd: add 'extraOptions' optionBjørn Forsman2015-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And move the '--verbose' flag to extraOptions, so that users can easily disable it.
* | | | | | postgresql-backup: cleanupNikolay Amiantov2015-05-19
|/ / / / /
* | | / / Drop GNOME 3.12Luca Bruno2015-05-18
| |_|/ / |/| | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-29 05:42:43 +0000