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
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
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
6637ce9fd8
nixos/dovecot: set isSystemUser for mailUser
...
needed after 7a87973b4ced86e1ba94ee84449979d6afebc9ea
2021-04-16 00:42:43 +02: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
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
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
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
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
Sandro
f440f9bad7
Merge pull request #114465 from ncfavier/master
...
nixos/getty: add services.getty.extraArgs
2021-04-13 14:56:54 +02: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
José Romildo Malaquias
728c4f81b8
nixos/e16: add e16 module
2021-04-12 16:31:48 -03:00
Vladimir Serov
7d396a4219
nixos/sane: added lp and avahi group ( #117952 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-12 21:29:49 +02:00
Luke Granger-Brown
08b22e605b
Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging
2021-04-12 18:49:01 +00:00
Sandro
311ceed827
Merge pull request #117551 from TredwellGit/nixos/rtl-sdr
...
nixos/rtl-sdr: blacklist DVB kernel modules
2021-04-12 20:23:04 +02:00
Sandro
000af0d8bf
Merge pull request #118658 from rhoriguchi/networkmanager
...
nixos/networkmanager: add missing kernel module for wpa authentication
2021-04-12 20:18:32 +02:00
Konrad Borowski
66b2aaf2eb
Revert "nixos/systemd: provide libidn2 for systemd-resolved"
...
This patch is no longer necessary with systemd v247.3.
This reverts commit c674a51382ce556f98c76f270275ecece3a4936a.
2021-04-12 18:37:18 +02:00
Sandro
ab1a223747
Merge pull request #112322 from mohe2015/module/declarative-step-ca
2021-04-12 17:35:54 +02:00
Sandro
39060b241c
Merge pull request #118445 from SuperSandro2000/SuperSandro2000-patch-3
2021-04-12 17:18:50 +02:00
Sandro
0c1d21dfa8
Merge pull request #117905 from yoctocell/privoxy-module-fix-forward-socks5
...
nixos/privoxy: add missing "/" to "forward-socks5" option
2021-04-12 16:49:29 +02:00
Sandro
512e44abb1
Merge pull request #101852 from takagiy/init-wmderland
2021-04-12 16:44:46 +02:00
Bryan Gardiner
1ccae60c2c
nixos/system76: add system76-firmware to environment.systemPackages
2021-04-11 20:00:04 -07:00