10513 Commits

Author SHA1 Message Date
Maximilian Bosch
f62b42f405
Merge pull request #120125 from BBBSnowball/pr-add-config-nextcloud-imagick-rename-option
nixos/nextcloud: Rename option disableImagemagick to enableImagemagick
2021-04-23 23:27:34 +02:00
Alyssa Ross
0d0e7ca769
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/top-level/python-packages.nix
2021-04-23 21:18:11 +00:00
Aaron Andersen
5f2a8deb17
Merge pull request #120324 from pennae/restart-sshguard
nixos/sshguard: restart sshguard when services/backend changes
2021-04-23 16:56:30 -04:00
Jörg Thalheim
4230f632cc
Merge pull request #120254 from Luflosi/ipfs-simplify-systemd-unit
nixos/ipfs: remove separate ipfs-init systemd unit
2021-04-23 17:00:37 +01:00
pennae
265d31bcbd nixos/sshguard: restart sshguard when services/backend changes
backends changing shouldn't be very likely, but services may well change. we
should restart sshguard from nixos-rebuild instead of merely plopping down a new
config file and waiting for the user to restart sshguard.
2021-04-23 16:16:37 +02:00
Luflosi
b32b56cd54
nixos/ipfs: remove separate ipfs-init systemd unit
There is no need for a separate unit. Simplify the NixOS module by adding the shell code to preStart of the main unit, where the other initialization code already is.
2021-04-22 21:13:05 +02:00
github-actions[bot]
b95da5efb6
Merge master into staging-next 2021-04-22 18:14:27 +00:00
Viktor Kronvall
c01046b022 services.buildkite-agents: support multi-tags
The buildkite agent supports multiple tags with the same key. This
functionality is used to have a [single agent listen on multiple
queues](https://buildkite.com/docs/agent/v3/queues#setting-an-agents-queue).

However, having the tags be of type `attrsOf str` means that
we cannot suport this use case. This commit modifies the type
of tags to be `attrsOf (either str (listOf str))` where the list
is expanded into multiple tags with the same key.

Example:
```
{tags = {queue = ["default", "testing"];};}
```
generates
```
tags="queue=default,queue=testing"
```
in the buildkite agent configuration.
2021-04-22 21:23:52 +09:00
github-actions[bot]
120744d620
Merge master into staging-next 2021-04-22 12:06:24 +00:00
Jörg Thalheim
40945d399d
quagga: remove
Upstream repositories do no longer exists. There has been no release in
a while. - Not a good combination for a network daemon running as root
in C that parses network packets...
2021-04-22 12:48:48 +02:00
Michael Weiss
3e01d42024
maintainers: remove tavyc
Their last commit was dcc84d8 from 2017.
Thank you for your contributions.
2021-04-22 11:34:25 +02:00
Benjamin Koch
8122221c9b nixos/nextcloud: Rename services.nextcloud.nginx.disableImagemagick to services.nextcloud.nginx.enableImagemagick
Enable options are preferred. Suggested here:
https://github.com/NixOS/nixpkgs/pull/115372#issuecomment-821900334
2021-04-22 02:17:12 +02:00
Martin Weinelt
6292be499b
Merge branch 'master' into staging-next 2021-04-22 00:54:14 +02:00
Luflosi
5ff547e729
nixos/ipfs: fix typo in comment
This typo was introduced in 4044d81d5cea617e58ec9682f9cc447dde326850.
2021-04-21 21:49:48 +02:00
github-actions[bot]
9b3e698b14
Merge master into staging-next 2021-04-21 12:06:23 +00:00
Florian Klink
7ff18cdf3c nixos/xserver: set fs.inotify.max_user_instances too
A too low number of inotify user instances causes similar problems as
max_user_watches. Without this, my workstation keeps running into things
like this:

$ sudo systemctl restart display-manager.service
Failed to allocate directory watch: Too many open files
2021-04-21 13:49:40 +02:00
Oleksii Filonenko
c2900f685f
Merge pull request #111518 from Jaculabilis/nebula
nixos/nebula: add basic module
2021-04-21 11:17:30 +03:00
github-actions[bot]
99c7bab106
Merge master into staging-next 2021-04-21 00:15:20 +00:00
Martin Weinelt
1c4f6dd00e
Merge pull request #119929 from expipiplus1/patch-3
modules.matrix-appservice-irc: allow connecting to unix sockets
2021-04-21 00:54:11 +02:00
Jörg Thalheim
a8e7d96eb2
Merge pull request #118961 from Izorkin/update-redis-sandbox
nixos/redis: enable sandbox mode
2021-04-20 21:12:10 +01:00
Sandro
6a5576e420
Merge pull request #119798 from yorickvP/mv-oauth2_proxy 2021-04-20 21:49:50 +02:00
Joe Hermaszewski
03ea3ba1ed
modules.matrix-appservice-irc: allow connecting to unix sockets
In order to connect to postgres sockets.

This took a while to track down :/
2021-04-20 15:48:50 +08:00
github-actions[bot]
6ef7c23763
Merge master into staging-next 2021-04-19 18:11:51 +00:00
Lorenz Leutgeb
0b0cd3f6aa
mxisd: remove (#119372)
* mxisd: remove

See EOL notice at https://github.com/kamax-matrix/mxisd/blob/master/EOL.md#end-of-life-notice

* mxisd: Add throwing EOL notice
2021-04-19 11:26:08 -04:00
Maciej Krüger
9f566fc6bc
Merge pull request #119813 from mkg20001/http3 2021-04-19 14:31:02 +02:00
Maciej Krüger
9530794548
nginx: add vhost.http3
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-18 20:20:24 +02:00
github-actions[bot]
b57b2b362c
Merge master into staging-next 2021-04-18 18:10:37 +00:00
Sandro
15cd5fc57e
nixos/nginx: set isSystemUser 2021-04-18 16:15:48 +02:00
Yorick van Pelt
279c7d43ee
nixos/oauth2_proxy: fix package name in nixos module 2021-04-18 14:21:38 +02:00
Johannes Schleifenbaum
dc282fc3f3
nixos/dnsdist: dndist.conf -> dnsdist.conf 2021-04-18 13:34:28 +02:00
github-actions[bot]
425886d6c2
Merge master into staging-next 2021-04-17 12:05:49 +00:00
Florian Klink
6c961dddd1 nixos/nullmailer: set isSystemUser
setting users.users.name.{isSystemUser,isNormalUser} is required since #115332
2021-04-17 12:29:51 +02:00
github-actions[bot]
1b82d09a50
Merge master into staging-next 2021-04-17 06:05:23 +00:00
Morgan Jones
064e0af80b nixos/nebula: Add enable option defaulting to true to Nebula networks 2021-04-16 19:57:02 -07:00
Alyssa Ross
cc10432418
mailman: add myself as a maintainer all around 2021-04-17 01:07:38 +00:00
Martin Weinelt
e5cc06a1e8
Merge pull request #119191 from NixOS/revert-118719-home-assistant-tests 2021-04-17 02:35:05 +02:00
Aaron Andersen
3041a85897
Merge pull request #111951 from f4814/add-quake3-module
nixos/quake3-server: Init
2021-04-16 20:20:18 -04:00
Robert Schütz
1d9f619311
nixos/home-assistant: warn about overridePythonAttrs in package option 2021-04-17 02:20:07 +02:00
github-actions[bot]
f620e30ca4
Merge master into staging-next 2021-04-17 00:15:03 +00:00
Sandro
0139874db9
nixos/nginx: add upstreams examples (#118447)
* nixos/nginx: add upstreams examples

I am not fully sure if they are fully correct but they deployed the right syntax.

* nixos/nginx: use literal example

* Update nixos/modules/services/web-servers/nginx/default.nix

* Update nixos/modules/services/web-servers/nginx/default.nix
2021-04-17 00:25:03 +02:00
Jörg Thalheim
0854659567
Merge pull request #119389 from marsam/drop-postgresql_9_5
postgresql_9_5: drop
2021-04-16 19:29:21 +01:00
github-actions[bot]
6a0f49f240
Merge master into staging-next 2021-04-16 18:13:19 +00:00
sternenseemann
ecfd3d4c53 nixos/services/matrix-synapse: fix eval errors in manual example 2021-04-16 18:13:42 +02:00
Kim Lindberger
7124e24a47
Merge pull request #119596 from talyz/discourse-2.6.5
discourse: 2.6.3 -> 2.6.5, module fixes
2021-04-16 16:06:47 +02:00
talyz
7310dd0da8
nixos/discourse: Fix plugin linking
When linking multiple plugins, the `ln` runs need to be separated by
newlines..

Fixes #119584.
2021-04-16 14:21:07 +02:00
talyz
515fb48312
nixos/discourse: Fail on file errors
Bash doesn't handle subshell errors properly if the result is used as
input to a command. To cause the services to fail when the files can't
be read, we need to assign the value to a variable, then export it
separately.
2021-04-16 14:21:01 +02:00
github-actions[bot]
d4f421cad9
Merge master into staging-next 2021-04-16 12:06:14 +00:00
Maximilian Bosch
84670bf681
wpa_supplicant: review fixes 2021-04-16 13:28:26 +02:00
Maximilian Bosch
08ced9d67f
nixos/wpa_supplicant: make new behavior opt-in 2021-04-16 13:18:46 +02:00
Maximilian Bosch
de0a39166b
wpa_supplicant: allow both imperative and declarative networks
For a while now it's possible to specify an additional config file in
`wpa_supplicant`[1]. In contrast to the file specified via `-c` this was
supposed to be used for immutable settings and not e.g. additional
networks.

However I'm a little bit unhappy about the fact that one has to choose
between a fully imperative setup and a fully declarative one where the
one would have to write credentials for e.g. WPA2-enterprise networks
into the store.

The primary problem with the current state of `wpa_supplicant` is that
if the `SAVE_CONFIG` command is invoked (e.g. via `wpa_cli`), all known
networks will be written to `/etc/wpa_supplicant.conf` and thus all
declarative networks would get out of sync with the declarative
settings.

To work around this, I had to change the following things:

* The `networking.wireless`-module now uses `-I` for declarative config,
  so the user-controlled mode can be used along with the
  `networks`-option.

* I added an `ro`-field to the `ssid`-struct in the
  `wpa_supplicant`-sources. This will be set to `1` for each network
  specified in the config passed via `-I`.

  Whenever config is written to the disk, those networks will be
  skipped, so changes to declarative networks are only temporary.

[1] https://w1.fi/cgit/hostap/commit/wpa_supplicant?id=e6304cad47251e88d073553042f1ea7805a858d1
2021-04-16 13:18:25 +02:00