Commit Graph

16361 Commits

Author SHA1 Message Date
Maximilian Bosch
22b61e5263
nixos/prometheus/exporters: fix eval if only openFirewall = true; is set
If `openFirewall = true`, but no `firewallFilter` is set, the evaluation
fails with the following error:

    The option `services.prometheus.exporters.node.firewallFilter` is defined both null and
    not null, in `/home/ma27/Projects/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix'
    and `/home/ma27/Projects/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix'.

Originally introduced by me in #115185. The problem is that
`mkOptionDefault` has - as its name suggests - the same priority as the
default-value of the option `firewallFilter` and thus it conflicts if
this declaration and the actual default value are set which is the case
if `firewallFilter` isn't specified somewhere else.
2021-03-13 15:21:55 +01:00
Milan
24133ead28
nixos/mautrix-telegram: substitute secrets in config file at runtime (#112966)
In the latest release of mautrix-telegram not all secrets can be set
using environment variables (see https://github.com/tulir/mautrix-telegram/issues/584).
This change allows these secret values to be set without ending up in
the Nix store.
2021-03-13 13:56:17 +01:00
WilliButz
3971cda05f
Merge pull request #116037 from petabyteboy/feature/jitsi-exporter
prometheus-jitsi-exporter: init at 0.2.18
2021-03-13 13:37:10 +01:00
Aaron Andersen
5a24206e17
Merge pull request #111030 from cript0nauta/miniflux-sudo
nixos/miniflux: don't depend on sudo
2021-03-12 20:42:09 -05:00
Aaron Andersen
47c5175f0c
Merge pull request #93629 from ju1m/croc
nixos/croc: init
2021-03-12 20:34:33 -05:00
Milan Pässler
b2bebd7cd5
nixos/prometheus-jitsi-exporter: init 2021-03-12 11:11:16 +01:00
WilliButz
f5c01cf9d4
Merge pull request #113370 from chkno/prometheus-systemd-exporter-no-flags
prometheus-systemd-exporter: Init at 0.4.0
2021-03-11 19:18:29 +01:00
WilliButz
3ceef8186c
Merge pull request #115185 from Ma27/knot-exporter
prometheus-knot-exporter: init at 2021-01-30; minor module improvements
2021-03-11 18:58:59 +01:00
WilliButz
902a479225
Merge pull request #111364 from lbpdt/feature/prometheus-artifactory-exporter
nixos/prometheus-exporters/artifactory: init at 1.9.0
2021-03-11 18:44:03 +01:00
Maximilian Bosch
7ecc3b0684
Merge pull request #115372 from BBBSnowball/pr-add-config-nextcloud-imagick
nixos/nextcloud: Conditionally enable ImageMagick PHP extension
2021-03-11 12:45:17 +01:00
rnhmjoj
7962df46fe
nixos/privoxy: make certificate-directory optional
The tmpfiles.d rule should only be added if inspectHttps is enabled.
2021-03-11 08:17:50 +01:00
Sarah Brofeldt
33d6e71133
Merge pull request #98446 from srhb/fix-kafka
apache-kafka: Fix, update and adjust JRE/JVM
2021-03-10 20:25:13 +01:00
Léo Gaspard
4ee87cfead
Merge pull request #113620 from imlonghao/borgmatic
borgmatic: init at 1.5.12
2021-03-10 18:13:04 +01:00
Cabia Rangris
352405c0f6 nixos.spotifyd: fixed file not found error
When using password_cmd, there's a 'file not found' error due to missing sh binary in path.
For some reason, adding `path = [ "/bin" ]` doesn't fix the issue, but setting `SHELL` does.
Related documentation: https://spotifyd.github.io/spotifyd/config/File.html#shell-used-to-run-commands-indicated-by-password_cmd-or-on_song_changed_hook----omit-in-toc---
2021-03-10 13:26:10 +01:00
Sarah Brofeldt
fd02940262 nixos/apache-kafka: Use version-matched jre 2021-03-10 08:10:30 +01:00
Sarah Brofeldt
08ef827056 nixos/apache-kafka: Drop default jvmOptions 2021-03-10 08:09:34 +01:00
Sandro
7a4d404e0f
Merge pull request #112689 from iblech/patch-whitebophir180 2021-03-09 22:12:24 +01:00
rnhmjoj
df6d7f3142
nixos/privoxy: document repeated settings 2021-03-09 17:59:12 +01:00
rnhmjoj
8e21a1c51b
nixos/privoxy: set temporary directory
This is needed for working external filters, otherwise privoxy will fail
without a clear error message.
2021-03-09 11:02:59 +01:00
rnhmjoj
3673ded392
nixos/privoxy: add https and settings options
This is a major rewrite of the Privoxy module:

- As per RFC0042, remove privoxy.extraConfig and replace it
  with a privoxy.settings option, which maps a NixOS freeform
  submodule to the Privoxy configuration format.

- Move all top-level options that mirrored a setting to
  the real ones in privoxy.settings. This still keeps the
  type-checking, default values and examples in places.

- Add two convenience options: userActions and userFilters, which
  simplify the operation of creating a file with pkgs.writeText,
  converting it to a string and adding it to the actionsfile/
  filterfile list.

- Add a privoxy.inspectHttps option to automagically setup TLS
  decryption support. I don't know how long have been waiting
  for this feature: can't believe it has just happened.

- Also add a privoxy.certsLifetime to control the periodical
  cleanup of the temporary certificates generate by Privoxy.
2021-03-09 11:02:59 +01:00
Michele Guerini Rocco
af6037b338
Merge pull request #111551 from xaverdh/xserver-modern-drivers
nixos/xserver: use modern video drivers
2021-03-09 08:14:24 +01:00
Benjamin Koch
6e6f5f0923 nixos/nextcloud: Rename option to services.nextcloud.disableImagemagick
... as was suggested in the related issue
2021-03-09 00:38:39 +01:00
Linus Heckemann
c762b1eaab
Merge pull request #90065 from wizeman/u/fix-config-merge
linux: make sure all config options have the same value
2021-03-08 21:34:59 +01:00
Robert Schütz
6692b32105
Merge pull request #112125 from dotlambda/alerta
alerta: move to all-packages.nix and use buildPythonApplication
2021-03-08 10:09:30 +01:00
Julien Moutinho
be6463cd9d nixos/croc: init 2021-03-08 01:34:32 +01:00
Benjamin Koch
e30311bc68 nixos/nextcloud: Conditionally enable ImageMagick PHP extension 2021-03-08 01:06:48 +01:00
Maximilian Bosch
bd54f78047
Merge pull request #114383 from Anderssorby/acs/fix-minetest-port-option-coercion
nixos/minetest-server: Fix port coercion
2021-03-07 21:37:49 +01:00
Lassulus
ba6d848c40
Merge pull request #112332 from urbas/amazon-init-options
virtualization/amazon-init: enable option
2021-03-07 18:39:05 +01:00
Ricardo M. Correia
6feb61233b linux: make sure all config options have the same value
Currently, kernel config options whose value is "yes" always override
options whose value is "no".

This is not always desired.

Generally speaking, if someone defines an option to have the value
"no", presumably they are disabling the option for a reason, so it's
not always OK to silently enable it due to another, probably unrelated
reason.

For example, a user may want to reduce the kernel attack surface and
therefore may want to disable features that are being enabled in
common-config.nix.

In fact, common-config.nix was already silently enabling options that
were intended to be disabled in hardened/config.nix for security
reasons, such as INET_DIAG.

By eliminating the custom merge function, these config options will
now use the default module option merge functions which make sure
that all options with the highest priority have the same value.

A user that wishes to override an option defined in common-config.nix
can currently use mkForce or mkOverride to do so, e.g.:

BINFMT_MISC = mkForce (option no);

That said, this is not going to be necessary in the future, because
the plan is for kernel config options defined in nixpkgs to use a
lower priority by default, like it currently happens for other module
options.
2021-03-07 18:27:14 +01:00
Lassulus
f38b9b258f
Merge pull request #113714 from ilian/steam-firewall
nixos/steam: Add port forwarding options
2021-03-07 14:22:16 +01:00
Jörg Thalheim
413b44590f
Merge pull request #114482 from jansol/pipewire 2021-03-07 09:34:42 +00:00
Johan Thomsen
7b5c38e973 nixos/kubernetes: docker -> containerd
also, nixos/containerd: module init
2021-03-07 12:51:14 +10:00
Yurii Matsiuk
7da62867be nixos/kubernetes: adapt module and test cases to fit kubernetes v1.20.X as well as coredns v1.7.X 2021-03-07 12:50:39 +10:00
Vincent Haupert
b012891437 nixos/fish: adapt completions patch to fish 3.2.0 2021-03-06 16:26:22 -08:00
Martin Weinelt
b349460dd8
Merge pull request #115016 from mweinelt/home-assistant 2021-03-06 19:26:20 +01:00
Léo Gaspard
393d300055
xfce module: enable notification daemon by default (#115130)
The notification daemon is just one part of XFCE that is, to the best of
my understanding, not particularly related to it being desktop or not —
for instance, not more related than the session manager or the like.
2021-03-06 19:04:15 +01:00
TredwellGit
e3d705e601 nixos/xserver: use modern video drivers
cirrus is obsolete: https://www.vintage3d.org/cirrus.php
nv is obsolete: https://www.phoronix.com/scan.php?page=article&item=nvidia_kills_nv&num=1
vesa is obsolete: https://www.phoronix.com/scan.php?page=news_item&px=Nzc3Nw
ati and ati_unfree are superseded by amdgpu and amdgpu-pro: https://wiki.gentoo.org/wiki/ATI_FAQ#Is_my_AMD.2FATI_board_supported.3F
nouveau and fbdev added for better fallback support.
2021-03-06 08:47:18 +01:00
Martin Weinelt
1050f1487b
nixos/home-assistant: disable tests on the package by default
We are running over 6000 tests by now and they take around 5 minutes
on faster machines and tests alot of components that endusers will not
actually be using. It is sufficient if we run them on package upgrades
and in the passthrough test.
2021-03-06 03:02:06 +01:00
rnhmjoj
c0c288b70b nixos/libvirtd: remove systemd-udev-settle
This dependency has been added in 65eae4d, when NixOS switched to
systemd, as a substitute for the previous udevtrigger and hasn't been
touched since. It's probably unneeded as the upstream unit[1] doesn't
do it and I haven't found any mention of any problem in NixOS or the
upstream issue trackers.

[1]: https://gitlab.com/libvirt/libvirt/-/blob/master/src/remote/libvirtd.service.in
2021-03-05 23:44:28 +01:00
Maximilian Bosch
2838365903
nixos/prometheus/exporters: assert that openFirewall is true if firewallFilter is declared 2021-03-05 13:35:16 +01:00
Maximilian Bosch
b4bd584b64
nixos/prometheus/exporters/knot: init 2021-03-05 13:13:46 +01:00
Maximilian Bosch
d65d9dea2c
nixos/prometheus/exporters: use types.port for port option 2021-03-05 13:06:03 +01:00
WORLDofPEACE
583f1a96b1
Merge pull request #114000 from worldofpeace/plymouth-bgrt
nixos/plymouth: use bgrt theme
2021-03-04 18:32:30 -05:00
Jan Solanti
b012ecaae7 pipewire: 0.3.22 -> 0.3.23 2021-03-05 00:41:02 +02:00
Jan Solanti
78bfbdd77a pipewire: 0.3.21 -> 0.3.22 2021-03-05 00:39:32 +02:00
Maximilian Bosch
594eff1d59
Merge pull request #113958 from Ma27/nextcloud21
nextcloud21: init at 21.0.0, set as default version
2021-03-04 21:47:26 +01:00
Maximilian Bosch
690449f3ae
nixos/nextcloud: enable apc cache for cli if apcu is enabled
As described in the admin manual[1] of Nextcloud.

[1] https://docs.nextcloud.com/server/21/admin_manual/configuration_server/caching_configuration.html#id1
2021-03-04 21:13:51 +01:00
davidak
00b47419c6
Merge pull request #103705 from freezeboy/add-plik
plik: init at 1.3.1
2021-03-04 20:28:34 +01:00
Lassulus
6402bee9d4
Merge pull request #113203 from leonardp/ceph-fix
nixos/ceph: fix ceph.client.extraOptions type
2021-03-04 20:13:36 +01:00
imlonghao
c026da4056 borgmatic: init at 1.5.12 2021-03-04 13:01:03 +08:00