summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* 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.
* | | | | | | | | | Merge pull request #27117 from cjxgm/fix-nspawn-missing-suffixJörg Thalheim2018-04-22
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | systemd.nspawn: fix missing suffix
| * | | | | | | | | systemd.nspawn: fix missing suffixGiumo X. Clanjor (哆啦比猫/兰威举)2017-07-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix files placed in `/etc/systemd/nspawn/` missing `.nspawn` suffix
* | | | | | | | | | Merge pull request #27958 from LumiGuide/strongswan-swanctlMatthew Justin Bauer2018-04-21
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | nixos: add the strongswan-swanctl service
| * | | | | | | | | strongswan-swanctl: actually removed the strongswan parameter filesBas van Dijk2018-03-26
| | | | | | | | | |
| * | | | | | | | | strongswan-swanctl: fixed type of 'file' optionsBas van Dijk2018-02-28
| | | | | | | | | |
| * | | | | | | | | strongswan-swanctl: disable the structured strongswan config for now in ↵Bas van Dijk2018-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | favour of a literal config This reduces the number of option by over 600.
| * | | | | | | | | strongswan-swanctl: fix testBas van Dijk2018-02-28
| | | | | | | | | |
| * | | | | | | | | strongswan-swanctl: support strongswan-5.6.2 configuration optionsBas van Dijk2018-02-28
| | | | | | | | | |
| * | | | | | | | | strongswan-swanctl: don't generate options for charonBas van Dijk2018-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reduces the number of options from 1152 to 756.
| * | | | | | | | | strongswan-swanctl: support strongswan-5.6.1 configuration optionsBas van Dijk2018-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I determined which options got changed by executing the following commands in the strongswan repository: git diff -U20 5.6.0..5.6.1 src/swanctl/swanctl.opt git diff -U20 5.6.0..5.6.1 conf
| * | | | | | | | | nixos: add the strongswan-swanctl serviceBas van Dijk2018-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The strongswan-swanctl systemd service starts charon-systemd. This implements a IKE daemon very similar to charon, but it's specifically designed for use with systemd. It uses the systemd libraries for a native integration. Instead of using starter and an ipsec.conf based configuration, the daemon is directly managed by systemd and configured with the swanctl configuration backend. See: https://wiki.strongswan.org/projects/strongswan/wiki/Charon-systemd Note that the strongswan.conf and swantctl.conf configuration files are automatically generated based on NixOS options under services.strongswan-swanctl.strongswan and services.strongswan-swanctl.swanctl respectively.