summary refs log tree commit diff
path: root/nixos/modules
Commit message (Collapse)AuthorAge
* wrappers service: make /run/wrappers a mountpointNikolay Amiantov2017-02-21
| | | | | Also remove some compatibility code because the directory in question would be shadowed by a mountpoint anyway.
* Merge pull request #22264 from peterhoeg/m/modeswitchPeter Hoeg2017-02-21
|\ | | | | usb-modeswitch: 2.2.1 -> 2.5.0 and nixos module
| * usb-wwan: nixos modulePeter Hoeg2017-02-21
| |
* | Merge pull request #22715 from phi-gamma/fix-22709-xen-domUFranz Pletz2017-02-21
|\ \ | | | | | | xen: update domU config for pvgrub2
| * | xen: update domU config for pvgrub2Philipp Gesang2017-02-12
| | | | | | | | | | | | | | | | | | | | | | | | fix #22709 Recent pvgrub (from Grub built with “--with-platform=xen”) understands the Grub2 configuration format. Grub legacy configuration (menu.lst) is ignored.
* | | herbstluftwm module: add configFile optionAnders Papitto2017-02-21
| | | | | | | | | | | | based on the equivalent for i3
* | | systemd: Properly escape environment options.Kevin Cox2017-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using toJSON on a string value works because the allowed JSON escape sequences is almost a subset of the systemd allowed escape sequences. The only exception is `\/` which JSON allows but systemd doesn't. Luckily this sequence isn't required and toJSON don't produce it making the result valid for systemd consumption. Examples of things that this fixes are environment variables with double quotes or newlines.
* | | Merge pull request #22941 from mayflower/systemd-tmpfilesRobin Gloster2017-02-20
|\ \ \ | | | | | | | | systemd: setup tmpfiles on switching configuration
| * | | systemd: setup tmpfiles on switching configurationRobin Gloster2017-02-18
| | | | | | | | | | | | | | | | | | | | This fixes systemd.tmpfiles.rules on switching configuration so that does not only get applied on a fresh boot. This e.g. fixes kubernetes.
* | | | nixos.openntpd: don't spam systemd journalRicardo M. Correia2017-02-20
| | | | | | | | | | | | | | | | | | | | Starting `ntpd` with the `-d` option spams the systemd journal. Instead, let the server fork.
* | | | systemd-boot: Unlink loader.conf if it existsaszlig2017-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since systemd version 232 the install subcommand of bootctl opens the loader.conf with fopen() modes "wxe", where the "e" stands for exclusive, so the call will fail if the file exists. For installing the boot loader just once this is fine, but if we're using NIXOS_INSTALL_BOOTLOADER on a systemd where the bootloader is already present this will fail. Exactly this is done within the simpleUefiGummiboot installer test, where nixos-install is called twice and thus the bootloader is also installed twice, resulting in an error during the fopen call: Failed to open loader.conf for writing: File exists Removing the file prior to calling bootctl should fix this. I've tested this using the installer.simpleUefiGummiboot test and it now succeeds. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @edolstra, @shlevy, @mic92 Fixes: #22925
* | | | systemd-boot: Make sure /etc/machine-id existsaszlig2017-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This leads to the following error when trying to install a new machine where the machine ID wasn't yet initialized during boot: Failed to get machine did: No such file or directory In addition this was also detected by the simpleUefiGummiboot installer test. So let's generate a fallback machine ID by using systemd-machine-id-setup before actually running bootctl. Tested this by running the installer.simpleUefiGummiboot test, it still fails but not because of the machine ID. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @edolstra, @shlevy, @mic92 Fixes: #22561
* | | | Merge pull request #23014 from zraexy/zraexy-bumblebee-pmmethodNikolay Amiantov2017-02-20
|\ \ \ \ | | | | | | | | | | bumblebee service: Fix pmMethod bbswitch check
| * | | | bumblebee service: Fix pmMethod bbswitch checkzraexy2017-02-19
| | | | | | | | | | | | | | | Made useBbswitch work when pmMethod is "auto" and removed invalid pmMethod option "nouveau".
* | | | | Merge pull request #22882 from bjornfor/wiresharkRobin Gloster2017-02-20
|\ \ \ \ \ | |/ / / / |/| | | | nixos: add programs.wireshark option
| * | | | programs.wireshark: use setcap wrapperRobin Gloster2017-02-17
| | | | |
| * | | | nixos: add programs.wireshark optionBjørn Forsman2017-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be able to use Wireshark as an ordinary user, the 'dumpcap' program must be installed setuid root. This module module simplifies such a configuration to simply: programs.wireshark.enable = true; The setuid wrapper is available for users in the 'wireshark' group. Changes v1 -> v2: - add "defaultText" to the programs.wireshark.package option (AFAIK, that prevents the manual from being needlessly rebuilt when the package changes)
| * | | | setcapWrapper: add support for setting permissionsRobin Gloster2017-02-17
| | |_|/ | |/| |
* | | | munin service: listen on IPv6 loopback as well (#23012)florianjacob2017-02-20
| | | | | | | | | | | | munin service: listen on IPv6 loopback as well
* | | | mattermost sevice: JoinsNamespaceOf for local pgsql (#22899)Arian van Putten2017-02-20
| | | |
* | | | Merge pull request #22969 from symphorien/extrainitrdFranz Pletz2017-02-20
|\ \ \ \ | | | | | | | | | | grub module: add extraInitrd option
| * | | | grub module: add extraInitrd optionSymphorien Gibol2017-02-19
| |/ / /
* | | | Add ca-central-1 AMIsEelco Dolstra2017-02-19
| | | |
* | | | nvidia: support application profilesNikolay Amiantov2017-02-19
| | | | | | | | | | | | | | | | Closes #22666.
* | | | Merge pull request #20456 from ericsagnes/feat/loaf-dep-1Joachim F2017-02-19
|\ \ \ \ | | | | | | | | | | Use attrsOf in place of loaOf when relevant
| * | | | zope2 module: instance option loaOf -> attrsOfEric Sagnes2016-11-16
| | | | |
| * | | | znc module: networks option loaOf -> attrsOfEric Sagnes2016-11-16
| | | | |
| * | | | tinc module: networks, hosts option loaOf -> attrsOfEric Sagnes2016-11-16
| | | | |
| * | | | tahoe module: introducers, nodes option loaOf -> attrsOfEric Sagnes2016-11-16
| | | | |
| * | | | logcheck module: ignore, ignoreCron option loaOf -> attrsOfEric Sagnes2016-11-16
| | | | |
| * | | | acme module: certs option loaOf -> attrsOfEric Sagnes2016-11-16
| | | | |
* | | | | Merge pull request #22433 from laMudri/xfwm-optionJoachim F2017-02-19
|\ \ \ \ \ | | | | | | | | | | | | xfce: make xfwm optional
| * | | | | xfce: make xfwm optionallaMudri2017-02-04
| | | | | |
* | | | | | nixos.samba: add enableNmbd and enableWinbindd optionsRicardo M. Correia2017-02-18
| | | | | | | | | | | | | | | | | | | | | | | | This allows for disabling these services, in case they are not needed.
* | | | | | modules/mpd: factor out name & mention man 5 mpd.confProfpatsch2017-02-18
| | | | | |
* | | | | | network-interfaces service: fix typo in bonding optionsFranz Pletz2017-02-18
| | | | | |
* | | | | | mwprocapture: init at 1.2.3269 (#22160)Cray Elliott2017-02-18
| |_|_|/ / |/| | | |
* | | | | Merge pull request #22727 from mayflower/fix/netdev-master-bindstoFranz Pletz2017-02-18
|\ \ \ \ \ | | | | | | | | | | | | network-interfaces service: fix bindsTo deps for masters
| * | | | | network-interface service: tuntap ifs have netdev servicesFranz Pletz2017-02-18
| | | | | |
| * | | | | network-interfaces service: fix bindsTo deps for mastersFranz Pletz2017-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, netdev units for network interfaces defined in the nixos configurations would bindTo the systemd device unit of the interface if not in a container. In situations where you switch to a new nixos configration with changes to network-setup.service (like nameservers) and have stacked interfaces like vlans on a bond, it would fail to propagate restarts to the netdevs correctly resulting with broken networking. The bond would be present but no vlan interfaces rendering the machine unreachable. My fear is that the udev events fail to propagate correctly while a systemd transaction that is also restarting the triggered netdev service is running. This commit changes this behaviour so netdev services bindTo other netdev services if present and otherwise fall back to the previous behaviour. We also noticed that stacked interfaces would sometimes seemingly be stopped in the wrong order. For instance in the above example, the bond interface would be deleted before the vlan interfaces resulting in the vlan interfaces not being present when their service is being stopped. This would cause the systemd transaction to fail and thus break networking. Their postStop hooks are now allowed to fail as we have reached the desired state.
* | | | | | fix comments about nixos-hardware-scanBrice Waegeneire2017-02-18
| | | | | | | | | | | | | | | | | | | | | | | | It has been renamed to nixos-generate-config in 3ed4173
* | | | | | Merge branch 'staging'Vladimír Čunát2017-02-18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | A security update of libxml2 is within.
| * \ \ \ \ \ Merge pull request #22864 from abbradar/dbus-etcNikolay Amiantov2017-02-17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Redo DBus configuration
| | * | | | | | dbus service: use makeDBusConfNikolay Amiantov2017-02-16
| | | | | | | |
* | | | | | | | programs.mtr: init setcap-wrapperRobin Gloster2017-02-17
| | | | | | | |
* | | | | | | | activation-script service: add utillinux to pathNikolay Amiantov2017-02-17
| | | | | | | |
* | | | | | | | taskserver: Remove taskserver from systemPackagesaszlig2017-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is deliberate because using the taskd binary to configure Taskserver has a good chance of messing up permissions. The nixos-taskserver tool now can manage even manual configurations, so there really is no need anymore to expose the taskd binary. If people still want to use the taskd binary at their own risk they can still add taskserver to systemPackages themselves. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | | | | taskserver: Pass configuration via command lineaszlig2017-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Putting an include directive in the configuration file referencing a store path with the real configuration file has the disavantage that once we change the real configuration file the store path is also a different one. So we would have to replace that include directive with the new configuration file, which is very much error-prone, because whenever taskd modifies the configuration file on its own it generates a new one with *only* the key/value options and without any include directives. Another problem is that we only added the include directive on the first initalization, so whenever there is *any* configuration change, it won't affect anything. We're now passing all the configuration options via command line, because taskd treats everything in the form of --<name>=<value> to be a configuration directive. This also has the effect that we now no longer have extraConfig, because configuration isn't a file anymore. Instead we now have an attribute set that is mapped down to configuration options. Unfortunately this isn't so easy with the way taskd is configured, because there is an option called "server" and also other options like "server.cert", "server.key" and so on, which do not map very well to attribute sets. So we have an exception for the "server" option, which is now called "server.listen", because it specifies the listening address. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Fixes: #22705
* | | | | | | | taskserver: Allow helper tool in manual configaszlig2017-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The helper tool so far was only intended for use in automatic PKI handling, but it also is very useful if you have an existing CA. One of the main advantages is that you don't need to specify the data directory anymore and the right permissions are also handled as well. Another advantage is that we now have an uniform management tool for both automatic and manual config, so the documentation in the NixOS manual now applies to the manual PKI config as well. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | | | | taskserver/helpertool: Fix error message on exportaszlig2017-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error message displays that a specific user doesn't exist in an organisation, but uses the User object's name attribute to show which user it was. This is basically a very stupid chicken and egg problem and easily fixed by using the user name provided on the command line. Signed-off-by: aszlig <aszlig@redmoonstudios.org>