21465 Commits

Author SHA1 Message Date
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
Felix Tenley
c25e8e8c96 nixos/etebase-server: do not prompt for input during automatic upgrade 2021-04-16 13:08:42 +02:00
Milan Pässler
2ed0f723c7 nixos/mailman: add http listener for uwsgi
With the config suggested in the module docs both Mailman core and
Hyperkitty are running, but Mailman core can not connect to Hyperkitty,
since the default hyperkitty.baseUrl is not set up by the module.

This adds a http listener to the uwsgi config and changes the default
hyperkitty.baseUrl to connect to this http listener.
2021-04-16 12:16:12 +02:00
Robert Hensing
578acc7a42
Merge pull request #118018 from considerate/master
dockerTools: Implement merging of image tarballs
2021-04-16 09:17:44 +02:00
Guillaume Girol
f02d9c6626
Merge pull request #119582 from helsinki-systems/fix/dovecot-systemUser
nixos/dovecot: set isSystemUser for mailUser
2021-04-16 07:10:19 +00:00
Jörg Thalheim
ec050f16d4
Merge pull request #119238 from xfix/revert-no-longer-necessary-systemd-bug-workaround
Revert "nixos/systemd: provide libidn2 for systemd-resolved"
2021-04-16 07:41:39 +01:00
Martin Weinelt
cd7a519012
Merge branch 'master' into staging-next 2021-04-16 01:32:09 +02:00
ajs124
90f6033984 nixos/tests/dovecot: set mailUser and mailGroup 2021-04-16 00:43:11 +02:00
ajs124
6637ce9fd8 nixos/dovecot: set isSystemUser for mailUser
needed after 7a87973b4ced86e1ba94ee84449979d6afebc9ea
2021-04-16 00:42:43 +02:00
Bruno BELANYI
1144486f3a nixos/tests/podgrab: init 2021-04-15 20:57:22 +00:00
Bruno BELANYI
f1b36d19fd nixos/podgrab: add module
Closes #117284.
2021-04-15 20:57:21 +00:00
Felix Tenley
004e80f8ae nixos/etebase-server: set users.users.etebase-server.isSystemUser
- setting users.users.name.{isSystemUser,isNormalUser} is required since
  #115332
2021-04-15 21:49:50 +02:00
github-actions[bot]
dfd4f14303
Merge master into staging-next 2021-04-15 18:13:27 +00:00
Graham Christensen
ffd29c76f6
Merge pull request #117928 from ymatsiuk/fprintd-tod
nixos/fprintd: add TOD support
2021-04-15 11:51:09 -04:00
Philipp Mildenberger
f5922de1d7 nixos/oci-containers: add support for environment files 2021-04-15 10:57:56 +02:00
Yurii Matsiuk
b29ed56049
nixos/fprintd: add TOD support
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Signed-off-by: Yurii Matsiuk <ymatsiuk@users.noreply.github.com>
2021-04-15 08:55:39 +02:00
github-actions[bot]
8b35f0c117
Merge master into staging-next 2021-04-15 06:05:40 +00:00
Martin Weinelt
65234f0911
nixos/test/prometheus-exporters/bird: fix race condition
The bird socket would not always be instantly present, when the exporter
was queried, leading to the test sometimes failing in its entirety.
2021-04-15 03:18:07 +02:00
figsoda
2f6a9bb297 nixos/programs/fish: add shellAbbrs config 2021-04-14 17:37:14 -07:00
Martin Weinelt
7cf67850c0
Merge branch 'master' into staging-next 2021-04-15 01:01:26 +02:00
Guillaume Girol
f1a2ab6818
Merge pull request #115332 from symphorien/usertype
nixos/users: require one of users.users.name.{isSystemUser,isNormalUser}
2021-04-14 19:38:26 +00:00
Symphorien Gibol
7a87973b4c nixos/users: require one of users.users.name.{isSystemUser,isNormalUser}
As the only consequence of isSystemUser is that if the uid is null then
it's allocated below 500, if a user has uid = something below 500 then
we don't require isSystemUser to be set.

Motivation: https://github.com/NixOS/nixpkgs/issues/112647
2021-04-14 20:40:00 +02:00
github-actions[bot]
eb8e023674
Merge master into staging-next 2021-04-14 18:11:01 +00:00
Alyssa Ross
912e11a468 mailman-web: 2019-09-29 -> 2021-04-10
* Make it clearer what code comments apply to
* Fix the state directory (this was changed in the update)
* Add m1cr0man as a maintaner

Co-authored-by: Lucas Savva <lucas@m1cr0man.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-14 16:23:09 +00:00
Kim Lindberger
59917dc3a9
Merge pull request #119427 from talyz/tengine-modules
tengine: Add modules to passthru
2021-04-14 17:42:01 +02:00
talyz
06dee38345
Revert "nixos/nginx: fix eval for tengine"
This reverts commit 2d3200e010cc4c6fae62d9f6c31357cb97d606d4.
2021-04-14 16:34:10 +02:00
Alyssa Ross
d0ead9021e
Revert "mailman-web-unstable: 2019-09-29 -> 2021-04-10 (#119135)"
This reverts commit 8dbd553792dcaf5074c47367ed6740f516862bad.

The update has changed where mailman-web looks for its database and
broken the Mailman module in NixOS.
2021-04-14 12:18:44 +00:00
github-actions[bot]
963ba38ad9
Merge master into staging-next 2021-04-14 12:06:11 +00:00
Florian Klink
950e92cac1
Merge pull request #119368 from flokli/rl-systemd-mutable
rl-2105: Document /etc/systemd-mutable/system -> boot.extraSystemdUnitPaths
2021-04-14 12:55:36 +02:00
Florian Klink
5429cc1af4 rl-2105: Document /etc/systemd-mutable/system is gone from the defaults, point to boot.extraSystemdUnitPaths 2021-04-14 12:52:58 +02:00
Vladimír Čunát
d2eb7a7887
Merge branch 'staging' into staging-next
A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
Jörg Thalheim
2a48ef1426
Merge pull request #103228 from ThinkChaos/fix_k3s_start
nixos/k3s: Update service to match upstream
2021-04-14 09:01:33 +01:00
Martin Weinelt
485034873f Revert "nixos/home-assistant: use overridePythonAttrs"
This reverts commit f9bd8b1b7bda019a823e93a0ecb719e15ac620cb.
2021-04-13 22:46:36 +02:00
Graham Christensen
d72a60a59f
Merge pull request #115590 from grahamc/iscsi
NixOS: services.{openiscsi, target}, boot.iscsi-initiator: init
2021-04-13 13:19:34 -04:00
Domen Kožar
6f7f5bacc8
Merge pull request #119277 from Pacman99/md-options
nixosOptionsDoc: add markdown formatting
2021-04-13 19:13:09 +02:00
Pacman99
d12aba5406 nixosOptionsDoc: add markdown formatting 2021-04-13 10:10:40 -07:00
Fabian Geiselhart
064b446fc0 nixos/quake3-server: Init 2021-04-13 16:24:12 +02:00
sternenseemann
17efdfbbca nixos/tests/kernel-generic: make attributes derivations, not functions
Pass the args from kernel-generic.nix's top-level to the individual
tests. Makes `nix-build -A nixosTests.kernel-generic.<attr>` and
`nix-build nixos/tests/kernel-generic.nix -A <attr>` work as expected.
2021-04-13 16:13:11 +02:00
Sandro
f440f9bad7
Merge pull request #114465 from ncfavier/master
nixos/getty: add services.getty.extraArgs
2021-04-13 14:56:54 +02:00
Yc.Shen
d43f88e3df nixos/kubernetes: allow merging multiple definitions of extraOpts 2021-04-13 21:54:53 +09:00
ThinkChaos
0b7c8b92f4
nixos/k3s: Change dependency to network.service
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
2021-04-13 13:37:41 +02:00
taku0
4c87cb87a2
Merge pull request #67684 from indiscipline/minio
nixos/minio: allow multiple data directories for erasure coding
2021-04-13 18:29:28 +09:00
Martin Weinelt
8e1e78a735
nixos/babeld: allow AF_INET communication required for netlink socket
This broke after seccomp was updated from 2.5.0 to 2.5.1 in 22148780.
2021-04-13 02:41:54 +02:00
Lucas Savva
8dbd553792
mailman-web-unstable: 2019-09-29 -> 2021-04-10 (#119135)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-13 01:31:53 +02:00
Sandro
122a2df9a7
Merge pull request #119259 from romildo/upd.e16 2021-04-13 01:23:27 +02:00