summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* nixos/dhparams: Introduce a 'stateful' optionaszlig2018-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option allows us to turn off stateful generation of Diffie-Hellman parameters, which in some way is still stateful as the generated DH params file is non-deterministic. However what we can avoid with this is to have an increased surface for failures during system startup, because generation of the parameters is done during build-time. Another advantage of this is that we no longer need to take care of cleaning up the files that are no longer used and in my humble opinion I would have preferred that #11505 (which puts the dhparams in the Nix store) would have been merged instead of #22634 (which we have now). Luckily we can still change that and this change gives the user the option to put the dhparams into the Nix store. Beside of the more obvious advantages pointed out here, this also effects test runtime if more services are starting to use this (for example see #39507 and #39288), because generating DH params could take a long time depending on the bit size which adds up to test runtime. If we generate the DH params in a separate derivation, subsequent test runs won't need to wait for DH params generation during bootup. Of course, tests could still mock this by force-disabling the service and adding a service or activation script that places pre-generated DH params in /var/lib/dhparams but this would make tests less readable and the workaround would have to be made for each test affected. Note that the 'stateful' option is still true by default so that we are backwards-compatible with existing systems. Signed-off-by: aszlig <aszlig@nix.build> Cc: @Ekleog, @abbradar, @fpletz
* nixos/dhparams: Turn params into a submoduleaszlig2018-04-26
| | | | | | | | | | | | | | | | | | | | We're going to implement an option which allows us to turn off stateful handling of Diffie-Hellman parameter files by putting them into the Nix store. However, modules now might need a way to reference these files, so we add a now path option to every param specified, which carries a read-only value of the path where to find the corresponding DH params file. I've also improved the description of security.dhparams.params a bit so that it uses <warning/> and <note/>. The NixOS VM test also reflects this change and checks whether the old way to specify the bit size still works. Signed-off-by: aszlig <aszlig@nix.build> Cc: @Ekleog
* nixos/dhparams: Add a VM testaszlig2018-04-26
| | | | | | | | | We're going to make changes to the dhparams module so we really want to make sure we don't break it, so having a NixOS VM test is to make sure we don't blow things up and can iterate on it. Signed-off-by: aszlig <aszlig@nix.build> Cc: @Ekleog
* Revert "gitlab: disable"Robin Gloster2018-04-26
| | | | | | This reverts commit 68c4605f1a251b97cb0fcde251ce52d498e2cef8. Gitlab has been fixed
* gitlab module: update to gitlab 10.7Robin Gloster2018-04-26
|
* Merge pull request #33679 from flokli/deluge-moduleMatthew Justin Bauer2018-04-25
|\ | | | | Deluge: use mkEnableOption, add test
| * deluge: add testFlorian Klink2018-04-13
| |
| * deluge: use mkEnableOptionFlorian Klink2018-04-13
| |
* | Merge pull request #35280 from markus1189/logkeysMatthew Justin Bauer2018-04-25
|\ \ | | | | | | Logkeys: Update and add `device` option to service
| * | logkeys.service: Add 'device' optionMarkus Hauck2018-02-21
| | |
* | | treewide: isArm -> isAarch32John Ericson2018-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following legacy packing conventions, `isArm` was defined just for 32-bit ARM instruction set. This is confusing to non packagers though, because Aarch64 is an ARM instruction set. The official ARM overview for ARMv8[1] is surprisingly not confusing, given the overall state of affairs for ARM naming conventions, and offers us a solution. It divides the nomenclature into three levels: ``` ISA: ARMv8 {-A, -R, -M} / \ Mode: Aarch32 Aarch64 | / \ Encoding: A64 A32 T32 ``` At the top is the overall v8 instruction set archicture. Second are the two modes, defined by bitwidth but differing in other semantics too, and buttom are the encodings, (hopefully?) isomorphic if they encode the same mode. The 32 bit encodings are mostly backwards compatible with previous non-Thumb and Thumb encodings, and if so we can pun the mode names to instead mean "sets of compatable or isomorphic encodings", and then voilà we have nice names for 32-bit and 64-bit arm instruction sets which do not use the word ARM so as to not confused either laymen or experienced ARM packages. [1]: https://developer.arm.com/products/architecture/a-profile
* | | nginx: allow basic auth passwords to be specified in a fileBen Wolsieffer2018-04-25
| | |
* | | Merge pull request #39473 from xeji/update-keymap-testSarah Brofeldt2018-04-25
|\ \ \ | | | | | | | | nixos/tests/keymap: wait for xdotool to succeed
| * | | nixos/tests/keymap: wait for xdotool to succeedxeji2018-04-25
| | | | | | | | | | | | | | | | | | | | | | | | xdotool failed in rare cases when a window was already created but not yet decorated by the window manager. also prevent a (never observed but possible) race condition
* | | | nixos: typofixes/tab deletion in some foundationdb docs/moduleAustin Seipp2018-04-25
| | | | | | | | | | | | | | | | Signed-off-by: Austin Seipp <aseipp@pobox.com>
* | | | Merge pull request #39304 from peterhoeg/f/haPeter Hoeg2018-04-25
|\ \ \ \ | |/ / / |/| | | home-assistant: add a few knobs and make config YAML
| * | | home-assistant: simplify definition of configFileRobert Schütz2018-04-24
| | | |
| * | | home-assistant: use remarshal to convert configuration to YAMLPeter Hoeg2018-04-23
| | | | | | | | | | | | | | | | | | | | | | | | HA doesn't mind the configuration being JSON instead of YAML but since YAML is the official language, use that as it allows users to easily exchange config data with other parties in the community.
| * | | home-assistant: make port configurable so we can use it elsewherePeter Hoeg2018-04-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally, some settings based on NixOS configuation is set via defaultConfig which is then merged with the user provided configration. For now that just means http port and time zone but others can easily be added.
* | | | Merge pull request #31833 from pngwjpgh/feat/acme/delayMatthew Justin Bauer2018-04-24
|\ \ \ \ | | | | | | | | | | nixos/acme: Allow for time window between cert issue and activation
| * | | | Fix incorrect mergeGregor Kleen2018-04-21
| | | | |
| * | | | Merge branch 'master' of github.com:NixOS/nixpkgs into feat/acme/delayGregor Kleen2018-04-21
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into feat/acme/delayMatthew Justin Bauer2018-04-21
| |\ \ \ \ \
| * | | | | | nixos/acme: Allow for time window between cert issue and activationGregor Kleen2017-11-19
| | | | | | |
* | | | | | | Merge pull request #39400 from xeji/improve-keymap-testsSarah Brofeldt2018-04-24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | nixos/tests/keymap: improve keymap tests
| * | | | | | | nixos/tests/keymap: improve keymap testsxeji2018-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simplify tests, prevent timeouts and non-deterministic failures
* | | | | | | | Merge pull request #39342 from samueldr/fix/nixos-enter-efivarfsMichael Raskin2018-04-23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | nixos-enter: Ensures presence of full /sys tree. (for efivarfs)
| * | | | | | | | nixos-enter: Ensures presence of full /sys tree.Samuel Dionne-Riel2018-04-22
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This partially reverts a change from e88f28965a7d76e83478d3ae6fcddc165b1c94f1 which removed the `mount --rbind /sys`. While true that the activation scripts will mount `sysfs` at `/sys`, none of the mountpoints lower in the `/sys` tree are handled by the activation script, which includes `efivarfs`. This fixes #38477 since it ensures the presence of `efivarfs` in the `/sys` tree, which is why the systemd-boot installation failed.
* | | | | | | | nixos/hans, nixos/iodine: fix passwordFile attributegnidorah2018-04-23
| | | | | | | |
* | | | | | | | nixos: add foundationdb module, documentationAustin Seipp2018-04-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Austin Seipp <aseipp@pobox.com>
* | | | | | | | Merge pull request #36734 from gnidorah/hansMatthew Justin Bauer2018-04-23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | nixos/hans: init
| * | | | | | | | hans: rename optiongnidorah2018-03-28
| | | | | | | | |
| * | | | | | | | hans, iodine: correct scriptgnidorah2018-03-28
| | | | | | | | |
| * | | | | | | | nixos/iodine: passwordFile option #24288gnidorah2018-03-27
| | | | | | | | |
| * | | | | | | | nixos/hans: passwordFile option #24288gnidorah2018-03-27
| | | | | | | | |
| * | | | | | | | nixos/hans: initgnidorah2018-03-27
| | | | | | | | |
* | | | | | | | | nixos: documentation: implement `documentation.dev.enable` optionJan Malakhovski2018-04-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I know that "devinfo" output does not currently exist, but so does "devman". It is mentioned in the nixpkgs manual, but no derivation in nixpkgs actually uses it.
* | | | | | | | | nixos: documentation: move some code around, make docstrings more informativeJan Malakhovski2018-04-23
| | | | | | | | |
* | | | | | | | | Merge pull request #39322 from elitak/trezoradisbladis2018-04-23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | trezord: Added Trezor Model-T (v2) udev rules
| * | | | | | | | | trezord: Added Trezor Model-T (v2) udev rulesEric Litak2018-04-21
| | | | | | | | | |
* | | | | | | | | | Merge pull request #39155 from NixOS/zramSwap-one-devJörg Thalheim2018-04-23
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | zramSwap: default to 1 device
| * | | | | | | | | | zramSwap: remove mentions of old kernelsWout Mertens2018-04-19
| | | | | | | | | | |
| * | | | | | | | | | zramSwap: default to 1 deviceWout Mertens2018-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One device per cpu is only needed for kernel 3.14
* | | | | | | | | | | nixos/iso-image.nix: Fix typoTuomas Tynkkynen2018-04-22
| | | | | | | | | | |
* | | | | | | | | | | wireguard service: use scripts instead of ExecStarts/StopsNikolay Amiantov2018-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more in line with what other services do; also looks cleaner. It changes configuration entries for pre-and post-hooks type to lines from lists of strings which are more logical for them; coersion is provided for backwards compatibility. Finally, add several steps to improve robustness: 1. Load kernel module on start if not loaded; 2. Don't remove wireguard interface on start; it is removed on service stop. If it's not something is wrong.
* | | | | | | | | | | Merge pull request #39048 from oxij/nixos/fix-rename-bugsJoachim F2018-04-22
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nixos: fix rename.nix bugs
| * | | | | | | | | | | nixos: rename.nix: fix bugsJan Malakhovski2018-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced in 286b007bd327a1e8d6d1fe66702b951f2fd6e29a and then in 2e6b796761672e0e3ed685487007bb0d99126d91. This a proper fix for what 70c6f6572dda0f2516bad812857ef814ec710a12 tried to do. Removing the "config" prefix triggers the bug on pure nixos too, not only on nixops.
| * | | | | | | | | | | Revert "nixos/version: fix nixops pre 1.6 compatibility"Jan Malakhovski2018-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 70c6f6572dda0f2516bad812857ef814ec710a12.
* | | | | | | | | | | | raspberrypi-bootloader: Adds `firmwareConfig` config optionBastian Köcher2018-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `firmwareConfig` option will be appended to `/boot/config.txt`.
* | | | | | | | | | | | raspberrypi-bootloader: Adds support for using ubootBastian Köcher2018-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uboot is copied into `/boot` in the installation process. The boot entries are created by calling the `generic-extlinux-compatible` builder.