Commit graph

10335 commits

Author SHA1 Message Date
Frank Doepper 673ecfcbaa nixos/zfs: mount AFTER import 2018-06-15 20:58:43 +02:00
Aneesh Agrawal 94bd4787a9 nixos/postgresql: Use listen_addresses, not -i
The -i flag to control if PostgreSQL listens for TCP/IP connections has
been deprecated, so replace it with the modern alternative.
2018-06-13 23:03:02 -07:00
Aneesh Agrawal c2ab820d6a nixos/uwsgi: use python.withPackages 2018-06-13 22:47:22 -07:00
xeji 8e5891b33e
Merge pull request #41853 from volth/patch-153
network-interfaces.nix: remove duplicate code
2018-06-13 23:55:46 +02:00
Jörg Thalheim cc7aa24c8c
Merge pull request #41928 from woffs/zfs-service-enable
nixos/zfs: enable zfs services
2018-06-13 22:37:05 +01:00
Jörg Thalheim a89586a885
Merge pull request #41938 from tilpner/awesome-no-argb
nixos/awesome: Add noArgb option
2018-06-13 22:31:45 +01:00
Joachim F f0f385ae76
Merge pull request #41852 from oxij/nixos/tor-service
nixos/tor: fix systemd service
2018-06-13 19:52:10 +00:00
tilpner 903292a2d8
nixos/awesome: Add noArgb option
Add option to disable client transparency support in awesome,
which greatly improves performance in my setup
(and presumably will in some others).
2018-06-13 19:47:26 +02:00
Michael Raskin f35cc5eb42
Merge pull request #41764 from oxij/nixos/some-more-related-packages
nixos: add some more related packages
2018-06-13 17:03:56 +00:00
Jan Malakhovski b01ccbb899 nixos: xserver: add related packages 2018-06-13 16:25:10 +00:00
Jan Malakhovski 2a5688574c nixos: doc: make relatedPackages a bit smarter 2018-06-13 16:25:10 +00:00
Frank Doepper bea4323acf nixos/zfs: enable zfs services 2018-06-13 16:31:05 +02:00
Uli Baum 41f3dee176 nixos/tests/morty: fix non-deterministic failure
... due to improper timing
2018-06-13 16:29:58 +02:00
Sarah Brofeldt 2ebadc4d87
Merge pull request #41884 from johanot/k8s-improvements
nixos/kubernetes: improvements
2018-06-13 14:31:11 +02:00
Allan Espinosa 783eb8438a nixos/nexus: allow overriding the package
Useful when pulling nixos-unstable in a stable NixOS installation.
2018-06-13 08:02:17 -04:00
xeji bffc59badd
Merge pull request #37289 from disassembler/dnsdist
nixos/dnsdist: init module
2018-06-13 13:56:53 +02:00
volth 3ae018592d
nixos/tinc: minor fixes 2018-06-12 23:27:52 +00:00
Johan Thomsen 8d7ea96a13 nixos/kubernetes: improvements
- Added option 'cni.configDir' to allow for having CNI config outside of nix-store
  Existing behavior (writing verbatim CNI conf-files to nix-store) is still available.

- Removed unused option 'apiserver.publicAddress' and changed 'apiserver.address' to 'bindAddress'
  This conforms better to k8s docs and removes existing --bind-address hardcoding to 0.0.0.0

- Fixed c/p mistake in apiserver systemd unit description

- Updated 18.09 release notes to reflect changes to existing options
  And fixed some typos from previous PR

- Make docker images for Kubernetes Dashboard and kube-dns configurable
2018-06-12 22:47:32 +02:00
volth d79a5057d3 nixos/nat: optional networking.nat.externalInterface (#41864)
to prevent "cannot coerce null to string" raise before the assertions are checked
2018-06-12 15:14:15 +02:00
volth b25a2c9614 nixos/unbound: add restart (#41885) 2018-06-12 14:29:25 +02:00
Jörg Thalheim dbdad4b44b maintainers/create-azure.sh: remove hydra.nixos.org as binary cache (#41883) 2018-06-12 14:21:56 +02:00
Cole Mickens a44a9fdad6 azure: stop carrying qemu-220 patch 2018-06-12 02:06:03 -07:00
aszlig fb2c132db4
nixos/no-x-libs: Switch to using nixpkgs.overlays
The usage of nixpkgs.config.packageOverrides is deprecated and we do
have overlays since quite a while.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra
2018-06-11 20:58:33 +02:00
volth 4d07170dc0
network-interfaces.nix: remove duplicate code 2018-06-11 16:50:01 +00:00
Ryan Mulligan 24f176f016 nixos/mattermost: fix JoinsNamespaceOf config location 2018-06-11 09:47:01 -07:00
SLNOS adab27a352 nixos/tor: use ControlPort for controlSocket for simplicity 2018-06-11 15:52:24 +00:00
SLNOS 2de3c4bd78 nixos/tor: add tor-init service to fix directory ownerships, fix hardenings
This reverts a part of 5bd12c694b.

Apparently there's no way to specify user for RuntimeDirectory in systemd
service file (it's always root) but tor won't create control socket if the dir
is owned by anybody except the tor user.

These hardenings were adopted from the upstream service file, checked
against systemd.service(5) and systemd.exec(5) manuals, and tested to
actually work with all the options enabled.

`PrivateDevices` implies `DevicePolicy=closed` according to systemd.exec(5),
removed.

`--RunAsDaemon 0` is the default value according to tor(5), removed.
2018-06-11 15:52:24 +00:00
Raymond Gauthier 3dfc9cd826 nixos/uvcvideo.dynctrl: Init 2018-06-11 11:33:49 -04:00
volth 4c3352896e
nixos/initrd-network: support hetzner 2018-06-11 10:35:02 +00:00
Uli Baum 93cbb9b72f nixos/tomcat: fix eval error introduced by #40657 2018-06-11 11:02:54 +02:00
Maximilian Bosch aa46b1ec0e nixos/autosuggestions: add module (#41397)
The `zsh-autosuggestions` package provides several configuration options
such as a different highlight style (like `fg=cyan` which is easier to
read).

With `rename.nix` the old `programs.zsh.enableAutosuggestions` is still
functional, but yields the following warning like this during evaluation:

```
trace: warning: The option `programs.zsh.enableAutosuggestions' defined in `<unknown-file>' has been renamed to `programs.zsh.autosuggestions.enable'.
```

The module provides the most common `zsh-autosuggestions` (highlight
style and strategy) as options that will be written into the interactive
shell init (`/etc/zshrc` by default). Further configuration options can
be declared using the `extraConfig` attr set:

```
{
  programs.zsh.autosuggestions.extraConfig = {
    "ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" = "buffer_size";
  };
}
```

A full list of available configuration options for `zsh-autosuggestions`
can be viewed here: https://github.com/zsh-users/zsh-autosuggestions/blob/v0.4.3/README.md
2018-06-10 23:08:50 +02:00
Tristan Helmich 1daa77160e tomcat service: fix webapps default option (#40657)
The old package tomcat.webapps does not exist
2018-06-10 20:10:01 +02:00
volth d4daddad75 nixos/nat: optional networking.nat.externalInterface (#41758) 2018-06-10 18:29:32 +02:00
Matthew Justin Bauer 7996889cf0
Merge branch 'master' into nixos-evaluate 2018-06-10 11:10:11 -04:00
Izorkin 9ef30fd56a sshd: change location of config file (#41744)
create symlink /etc/ssh/sshd_config
2018-06-10 01:39:06 +02:00
xeji 08197d032a
nixos/tests/gnome3: switch to lightdm (#41742) 2018-06-09 22:02:48 +02:00
Jörg Thalheim bf070df972
Merge pull request #41733 from Baughn/nix-sync
zfs: Fix "zfs-sync" for modern systemd
2018-06-09 08:29:26 +01:00
Andreas Rammhold 2b1915b9f6
Merge pull request #41731 from andir/memcached-test
nixos/memcached: added simple set/get test
2018-06-09 08:07:51 +02:00
Peter Hoeg 8219b4a7ab
Merge pull request #41057 from nyanloutre/duplicati/custom_options
nixos/duplicati: add port and datafolder options
2018-06-09 12:29:48 +08:00
Svein Ove Aas deb6c6e052 zfs: Fix "zfs-sync" for modern systemd 2018-06-09 01:17:04 +01:00
Andreas Rammhold 1305752ba0
nixos/memcached: added simple set/get test
The test ensures that the services comes up and accepts/provides values.
2018-06-09 02:11:15 +02:00
markuskowa 96af022af5 nixos/munge: run munge as user munge instead of root. (#41509)
* Added a note in release notes (incompatibilities)
* Adapt slurm test
* Change user to munge in service.munge
2018-06-09 00:50:28 +02:00
volth 2874e56c05 nixos/sslh: add transparent proxying support (#41412)
[x] Support transparent proxying. This means services behind sslh (Apache, sshd and so on) will see the external IP and ports as if the external world connected directly to them.
 [x] Run sslh daemon as unprivileged user instead of root (it is not only for security, transparent proxying requires it)
 [x] Removed pidFile support (it is not compatible with running sslh daemon as unprivileged user)
 [x] listenAddress default changed from "config.networking.hostName" (which resolves to meaningless "127.0.0.1" as with current /etc/hosts production) to "0.0.0.0" (all addresses)
2018-06-09 00:38:51 +02:00
nyanloutre 20f6c5c865
nixos/duplicati: add port and interface options 2018-06-09 00:34:13 +02:00
Andreas Rammhold 0decee48f5
Merge pull request #41466 from andir/haproxy-1.8.9
Haproxy 1.8.9
2018-06-08 23:41:05 +02:00
Andreas Rammhold e179003026
nixos/tests; add haproxy 2018-06-08 22:31:47 +02:00
xeji 951d3cc4b9
Merge pull request #41375 from phryneas/mosh-with-libutempter
nixos/programs.mosh: refactor
2018-06-08 21:56:15 +02:00
Lenz Weber 7c34c28cfa nixos/programs.mosh: refactor
Adds programs.mosh.withUtempter (default: true).
The option enables -with-utempter for mosh, allowing it to write to
/var/run/utmp and thus making connected sessions appear in the output
of `who -a`.

For that, a guid-wrapper is required. Also, the path to the `utempter` was
hardcoded in the resulting binary until now (so it could never been found),
thus, libutempter was patched accordingly to point to
/run/wrappers/bin/utempter which at least works when the wrapper is
configured.
2018-06-08 20:57:16 +02:00
Jörg Thalheim 53af41d301
Merge pull request #41652 from hamishmack/patch-4
minio: Output server logs & startup in json format
2018-06-08 16:20:04 +01:00
Matthieu Coudron eb7e0d42db doc: Explain how to hack on kernel
Presents the options available (linuxManualConfig versus overriding
extraConfig, ignoreConfigErrors, autoModules, kernelPreferBuiltin.

For advanced hostPlatform customization refer to the commands shared by ericson1234 at
https://github.com/NixOS/nixpkgs/pull/33813 but it is too advanced to
put in the doc.
2018-06-08 10:36:21 +03:00
Hamish Mackenzie 0e5c971af8
minio: Output server logs & startup in json format
Currently minio logs with enhanced tty data and journalctl does not include anything useful as a result:

```
Jun 08 11:03:28 alpha minio[17813]: [78B blob data]
Jun 08 11:03:28 alpha minio[17813]: [49B blob data]
Jun 08 11:03:28 alpha minio[17813]: [19B blob data]
Jun 08 11:03:28 alpha minio[17813]: [88B blob data]
Jun 08 11:03:28 alpha minio[17813]: [45B blob data]
Jun 08 11:03:28 alpha minio[17813]: [44B blob data]
Jun 08 11:03:28 alpha minio[17813]: [57B blob data]
```

Indicating that it detected some binary output.  With the `--json` flag it logs:

```
Jun 08 11:14:58 alpha minio[18573]: {"level":"FATAL","time":"2018-06-07T23:14:58.770637778Z","error":{"message":"--address input is invalid: address 127.0.0.1: missing port in address","source":["/build/go/src/github.com/minio/minio/cmd/server-main.go:121:cmd.serverHandleCmdArgs()"]}}
```
2018-06-08 11:22:00 +12:00
Brandon Elam Barker f098e60ecf nixos/sandbox: improve documentation.
This was put together based on feedback from LnL on IRC.
2018-06-07 21:43:52 +01:00
Joachim Fasting 2be28b1df5
Revert "Merge pull request #38263 from lopsided98/grub-initrd-secrets"
This reverts commit c06d7950f1, reversing
changes made to 4c25fbe338.

See https://github.com/NixOS/nixpkgs/issues/41608
2018-06-07 14:24:59 +02:00
Mathijs Kwik c4fd2b7318 nixos/docker-registry: allow running on ports < 1024 2018-06-06 22:26:26 +02:00
Joachim F c06d7950f1
Merge pull request #38263 from lopsided98/grub-initrd-secrets
grub: support initrd secrets
2018-06-06 19:05:54 +00:00
Uli Baum 4c25fbe338 nixos/release-combined: remove keymap tests from tested job
Temporary fix for #41538; non-deterministic failures
blocked the release channel.
2018-06-06 21:02:55 +02:00
Daiderd Jordan 4e0de0c587
Merge pull request #40729 from nlewo/pr-hydra-test
nixos/tests/hydra: build a trivial derivation
2018-06-06 20:13:30 +02:00
Antoine Eiche 891650bd44 nixos/tests/hydra: add it in nixos/release.nix 2018-06-06 18:00:41 +02:00
Antoine Eiche 47fc27b456 nixos/tests/hydra: build a trivial derivation
A script is used to create a project, and configure a jobset. This
jobset fetches a local file containing a trivial Nix expression. The
test script makes sure this derivation has been successfully built by
Hydra.
2018-06-06 18:00:41 +02:00
vicgc ee4bb9454e Fixed nilfs2 fsck error at boot because its not needed bu the nilfs2 filesystem 2018-06-06 00:24:04 +02:00
xeji c958516cb3
Merge pull request #41342 from samueldr/fix/doc/formatting-oopsies
Fixes doc auto-formatting oopsies
2018-06-05 23:50:44 +02:00
Graham Christensen 5467f0ed7a
Merge pull request #41486 from grahamc/support-null-font
grub: Support when boot.loader.grub.font is null
2018-06-05 13:29:28 -04:00
Graham Christensen ab889c14b5
install-grub: only try to loadfont if font is not null 2018-06-05 13:11:33 -04:00
Graham Christensen 52de38f5f4
grub-config.xml: handle a null font 2018-06-05 13:11:26 -04:00
Eelco Dolstra 70faa56775
Merge pull request #41446 from aszlig/make-serviceconfig-overridable
nixos/systemd: Allow to override serviceConfig
2018-06-05 17:35:28 +02:00
Matthieu Coudron 358296c05a owamp: adding module
You can retrieve the one way latency between your client and the remote
host via owping.
2018-06-05 22:15:28 +09:00
Mathijs Kwik 5f1ad29340 nixos/docker-registry: allow nested config options
for example:

services.dockerRegistry = {
    enable = true;
    extraConfig = {
        http = {
            host = "https://${config.networking.hostName}:5000";

            tls = {
                certificate = "${registry-tls}/snakeoil.pem";
                key = "${registry-tls}/snakeoil.key";
            };
        };
    };
};
2018-06-05 11:26:02 +02:00
aszlig 0e7c945e15
nixos/systemd: Allow to override serviceConfig
This has been reported by @qknight in his Stack Overflow question:

https://stackoverflow.com/q/50678639

The correct way to override a single value would be to use something
like this:

systemd.services.nagios.serviceConfig.Restart = lib.mkForce "no";

However, this doesn't work because the check is applied for the attrsOf
type and thus the attribute values might still contain the attribute set
created by mkOverride.

The unitOption type however did already account for this, but at this
stage it's already too late.

So now the actual value is unpacked while checking the values of the
attribute set, which should allow us to override values in
serviceConfig.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra, @qknight
2018-06-04 15:34:21 +02:00
Rob Vermaas 19332e4d52
Merge pull request #41311 from AmineChikhaoui/fix-gce-fetch-ssh
GCE image: properly remove the temporary ssh host keys files/directory
2018-06-04 11:38:07 +02:00
AmineChikhaoui 1398d0c312
avoid redundant rm calls 2018-06-04 10:23:40 +01:00
Thomas Kerber 61f5b9d6c4 nixos/gitea: Respect gitea-dump enable option. (#41437) 2018-06-04 08:41:20 +02:00
Geoffrey Huntley ca0e52edc3 kubernetes: corrected spelling mistake in docs (#41439) 2018-06-04 05:45:25 +00:00
Janne Heß b3e7923b94 nixos/exim: Add unit restart trigger (#41418) 2018-06-03 21:22:55 +02:00
Vladimír Čunát 448d7d648d
Merge branch 'staging'
It's only half-rebuilt on Hydra, but it brings a security fix.
2018-06-03 13:52:13 +02:00
Robert Helgesson 323c2a1c6b
mpd: fix spelling in description 2018-06-03 09:55:26 +02:00
Joachim F c30bd1c131
Merge pull request #41377 from markuskowa/slurm-ext-pr
nixos/slurm: Improve slurm configuration options and features.
2018-06-02 12:17:02 +00:00
Markus Kowalewski d7412d0b16
nixos/slurm: remove propagatedBuidInputs from slurmWrapped
propagatedBuildInputs = [ cfg.package etcSlurm ]; had no effect
2018-06-02 14:01:24 +02:00
Joachim F ae512f2d8e
Merge pull request #34886 from leenaars/mortyproxy
morty: init -> 0.2.0
2018-06-02 10:26:09 +00:00
Matthew Justin Bauer bc7ea93a47
Merge pull request #40028 from WilliButz/add-dnsmasq-exporter
prometheus-dnsmasq-exporter: init at 2018-05-05, add module
2018-06-01 23:18:49 -04:00
Matthew Justin Bauer e4746bdf15
Merge pull request #40037 from alunduil/fix-fcrontab-setuid
nixos/modules/services/scheduling/fcron: add setuid to fcrontab
2018-06-01 23:18:21 -04:00
Matthew Justin Bauer 20ca7af00f
Merge pull request #40171 from teto/ntp
[RDY] openntpd: make -s flag work
2018-06-01 23:16:20 -04:00
Matthew Justin Bauer 0135f04d77
Merge pull request #40242 from gnidorah/gvt
linux: enable support for iGVT-g VGPU
2018-06-01 23:14:35 -04:00
Matthew Justin Bauer 76d0d7ceb5
Merge pull request #40692 from Izorkin/sshd
sshd: add custom options
2018-06-01 23:08:28 -04:00
Markus Kowalewski c8faa482fa
nixos/slurm: update test, add test for enableStools
* Add pure submit host to test 'enableStools'
* Disable client.enable on control machine
2018-06-02 00:19:03 +02:00
Markus Kowalewski 8026127e47
slurm: add freeipmi, readline, libssh2, fix hwloc
* add freeipmi to get power meter readings
* readline support for scontrol
* libssh2 support for X11 supporta
* Add note to enableSrunX11 in module
* fix hwloc support (was detected by configure)
2018-06-02 00:18:29 +02:00
Markus Kowalewski b7e91f096a
nixos/slurm: Add man pages to wrapedSlurm
The nixos module adds a new derivation to
systemPackages to make sure that the binaries
get the generated config file. This derivation
did not contain the man pages so far.
Activating the module now makes the man pages
available in the system environment.
2018-06-02 00:18:28 +02:00
Markus Kowalewski 995d2ec928
nixos/slurm: Extend configuration options
* Updated SrunX11 option
* Added extraPlugstackConfig parameter
* Added option enableStools
* Add cgroup.conf to module
* Fix some typos
2018-06-02 00:17:59 +02:00
xeji b17b44232f
nixos/tests/iftop: fix non-deterministic failure (#41309)
- make sure machines are fully booted before sending commands
- test that capability setting in iftop module makes a difference
2018-06-01 22:27:51 +02:00
Andreas Rammhold bc069622dd
Merge pull request #41367 from andir/nixos-mpd-dbFile-null
nixos/mpd: allow services.mpd.dbFile to be null
2018-06-01 19:39:17 +02:00
Andreas Rammhold a0797bad2c
nixos/mpd: allow services.mpd.dbFile to be null
This change allows users to specify an alternative database method. For
example an mpd satellite setup where another mpd on the network shares
it's database with the local instance. The `dbFile` parameter must not be
configured in that case.
2018-06-01 19:17:15 +02:00
Tuomas Tynkkynen e864247f08 Merge branch 'plat-fix-for-merge-2' into master 2018-06-01 20:08:08 +03:00
Tuomas Tynkkynen f49906d80c nixos/sd-image-raspberrypi: Support Raspberry Pi Zero 2018-06-01 13:48:55 +03:00
aszlig 0385d69f87
tests/containers-imperative: Include stdenvNoCC
While building the container there are a few occasions where stdenvNoCC
is used underneath. During the last staging merge, some change now tries
to build texinfo during the test while building stdenvNoCC.

With this change, I'm adding stdenvNoCC to the closure to make sure that
even when we have future stdenv changes, it doesn't break (well, except
if we do have another variation like stdenvNoCC that overrides stdenv).

I haven't bisected the exact change, but I'd suspect that it could be
one of the commits in #39457.

This fixes the test and it no longer fails with the following error:

error: unable to download 'http://ftpmirror.gnu.org/texinfo/texinfo-6.5.tar.xz': Couldn't resolve host name (6)
builder for '/nix/store/r7sf1wjbnimwgnv276jh59nfnzw40x30-texinfo-6.5.tar.xz.drv' failed with exit code 1
cannot build derivation '/nix/store/5w1pv788ayi1wahyy76i90yqv96ai4h5-texinfo-6.5.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/cnsfkf0j5xmm14zzm5a3a66pz66gbc82-stdenv-linux.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/11kkhk57ic8kfd7g197sqwgd0pzqfjhl-nixos-system-foo-0-18.09pre-git.drv': 1 dependencies couldn't be built
error: build of '/nix/store/11kkhk57ic8kfd7g197sqwgd0pzqfjhl-nixos-system-foo-0-18.09pre-git.drv' failed
/run/current-system/sw/bin/nixos-container: failed to build initial container configuration

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @aristidb, @edolstra, @chaoflow, @kampfschlaefer
2018-06-01 08:20:20 +02:00
Samuel Dionne-Riel 15fa70cd78 nixos/doc+man: Fixes squishedtogether definitions. 2018-05-31 21:07:15 -04:00
Samuel Dionne-Riel 88ca2b1ec4 nixos/doc: ran make format
With visual inspection that nothing got worse.
2018-05-31 21:03:51 -04:00
Samuel Dionne-Riel bc0421c4cf doc: Adds xml fixing script. (see previous and next commits)
This script is used to automatically fix issues within xml documentation
files.

The script is *for now* intended to be used ad-hoc, and the commits to
be examined.

A future discussion will define whether:

  * This commit and scripts are kept.
  * The script is extended for common use.

The biggest issue right now with the script is that it *could* in theory
destroy a valid space-less varlistentry.

The script could, in practical use, be changed and extended to normalize
some parts of the XML files, mainly:

  * A common quoting style for attributes
  * Fix-up some weird formatting automatically that xmlformat doesn't
    catch
2018-05-31 21:02:15 -04:00
Samuel Dionne-Riel aa59151c21 doc: Adds rule to xmlformat to help keep spacing right.
The other definitions broke term, cmdsynopsis and arg tags; spaces
inside were removed, making workdsrun-ininstead of keeping them spaced.
2018-05-31 21:02:15 -04:00
Jan Tojnar 86c4a640b4
Revert "nixos: disable gdk-pixbuf test"
This reverts commit 218ada1ba7.
2018-06-01 00:17:38 +02:00
coretemp 2d3db84ddb dnscrypt-proxy: make man 8 dnscrypt-proxy work (#41039) 2018-05-31 23:15:19 +02:00
Matthew Bauer 05eb57b35d Revert "nixpkgs module: Fix defaulting of localSystem and system"
This reverts commit 4fe2898608.

This gives a recursion in certain nixpkgs configs.
2018-05-31 15:55:36 -04:00