Jan Tojnar
76c3a6aafd
Merge branch 'staging-next' into staging
2021-04-29 02:35:54 +02:00
Martin Weinelt
de5a69c918
nixos/promtail: Set TimeoutStopSec=10
...
On reboots and shutdowns promtail blocks for at least 90 seconds,
because it would still try to deliver log messages for loki, which isn't
possible when the network has already gone down.
Upstreams example unit also uses a ten seconds timeout, something which
has worked pretty well for me as well.
2021-04-28 21:02:11 +02:00
github-actions[bot]
70093bbd44
Merge staging-next into staging
2021-04-28 06:05:49 +00:00
Aaron Andersen
45eb9c21ee
Merge pull request #119672 from chessai/init-duckling-service
...
init duckling service
2021-04-27 20:58:28 -04:00
github-actions[bot]
655989d7b3
Merge staging-next into staging
2021-04-28 00:15:29 +00:00
Izorkin
8723d226b4
nixos/mastodon: update SystemCallFilters
2021-04-28 00:44:25 +02:00
github-actions[bot]
97889a52e1
Merge staging-next into staging
2021-04-27 18:14:28 +00:00
chessai
e47e2a1b9f
init duckling service
2021-04-27 10:41:07 -07:00
talyz
7a67a2d1a8
gitlab: Add patch for db_key_base length bug, fix descriptions
...
The upstream recommended minimum length for db_key_base is 30 bytes,
which our option descriptions repeated. Recently, however, upstream
has, in many places, moved to using aes-256-gcm, which requires a key
of exactly 32 bytes. To allow for shorter keys, the upstream code pads
the key in some places. However, in many others, it just truncates the
key if it's too long, leaving it too short if it was to begin
with. This adds a patch that fixes this and updates the descriptions
to recommend a key of at least 32 characters.
See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53602
2021-04-27 17:49:43 +02:00
github-actions[bot]
f0290a5d27
Merge staging-next into staging
2021-04-26 18:14:28 +00:00
Robert Schütz
e22d76fe34
Merge pull request #120520 from minijackson/jellyfin-remove-10.5
...
jellyfin_10_5: remove unmaintained version
2021-04-26 17:16:43 +02:00
Minijackson
2ad8aa72ae
jellyfin_10_5: remove unmaintained version
...
This version contains a vulnerability[1], and isn't maintained. The
original reason to have two jellyfin versions was to allow end-users to
backup the database before the layout was upgraded, but these backups
should be done periodically.
[1]: <https://nvd.nist.gov/vuln/detail/CVE-2021-21402 >
2021-04-26 14:11:29 +02:00
github-actions[bot]
e30742adc3
Merge staging-next into staging
2021-04-26 12:06:35 +00:00
Lassulus
ee04d772e4
Merge pull request #120489 from samueldr/fix/make-disk-image-auto-size
...
Fix make disk image automatic size
2021-04-26 10:34:15 +02:00
github-actions[bot]
9a945aac72
Merge staging-next into staging
2021-04-25 18:14:18 +00:00
Luke Granger-Brown
ed83f6455c
Merge pull request #119443 from ambroisie/add-podgrab
...
Add podgrab package and module
2021-04-25 14:12:40 +01:00
github-actions[bot]
1626c4772a
Merge staging-next into staging
2021-04-25 12:06:12 +00:00
Frederik Rietdijk
c648f7ee2a
Merge master into staging-next
2021-04-25 13:54:29 +02:00
Luke Granger-Brown
0cc25061b0
Merge pull request #114240 from sorki/containers/nested
...
nixos/nixos-containers: default boot.enableContainers to true
2021-04-25 11:37:01 +01:00
Luke Granger-Brown
2136e90fa3
Merge pull request #114637 from KaiHa/pr/fix-systemd-boot-builder
...
systemd-boot-builder.py: ignore profile names with invalid chars
2021-04-25 11:35:00 +01:00
Luke Granger-Brown
30ab5fb006
Merge pull request #107604 from pkern/exim
...
nixos/exim: Make queue runner interval configurable and reduce it to 5m by default
2021-04-25 11:15:17 +01:00
Luke Granger-Brown
2fa2e63932
Merge pull request #103902 from pkern/spamassassin
...
nixos/spamassassin: Avoid network dependency on boot
2021-04-25 11:14:57 +01:00
Jan Tojnar
c1f851b2ee
Merge branch 'staging-next' into staging
2021-04-25 08:22:13 +02:00
Jörg Thalheim
6e90599166
Merge pull request #120508 from Mic92/nixos-install
...
nixos-install: fix flake command
2021-04-25 07:17:06 +01:00
github-actions[bot]
a956f62ea4
Merge master into staging-next
2021-04-25 06:05:34 +00:00
Jan Tojnar
0f1c4558d3
Merge branch 'master' into staging-next
...
Choose binwalk 2.3.1, 27 is legacy version for Python 2.
2021-04-25 02:50:48 +02:00
Martin Weinelt
e8988f7a30
nixos/babeld: run as DynamicUser
...
The last bits to prevent babeld from running unprivileged was its
kernel_setup_interface routine, that wants to set per interface
rp_filter. This behaviour has been disabled in a patch that has been
submitted upstream at https://github.com/jech/babeld/pull/68 and reuses
the skip-kernel-setup config option.
→ Overall exposure level for babeld.service: 1.7 OK 🙂
2021-04-25 00:54:52 +02:00
Lassulus
ea5759474a
Merge pull request #119803 from SuperSandro2000/SuperSandro2000-patch-1
...
nixos/nginx: set isSystemUser
2021-04-24 22:37:46 +02:00
lassulus
5aa4273e4f
treewide: use auto diskSize for make-disk-image
...
(cherry picked from commit f3aa040bcb
)
2021-04-24 14:49:07 -04:00
Guillaume Girol
1c62c0f370
Merge pull request #120537 from symphorien/nagios-restart
...
nixos/nagios: use the correct option to restart on config change
2021-04-24 17:58:19 +00:00
Lassulus
118485230c
Merge pull request #119725 from helsinki-systems/feat/flexoptix-app
...
flexoptix-app: Init at 5.9.0
2021-04-24 19:34:18 +02:00
Izorkin
47d3e955fc
nixos/mastodon/sandbox: add @privileged and @raw-io to SystemCallFilter
2021-04-24 19:12:10 +02:00
Symphorien Gibol
ddf567cd5a
nixos/nagios: use the correct option to restart on config change
...
X-ReloadIfChanged is incorrect, apparently https://github.com/NixOS/nixpkgs/pull/120324#discussion_r619472321
We restart instead of reloading because nagios unit file has no
ExecReload.
2021-04-24 17:12:51 +02:00
Michael Raskin
d04f1c4314
Merge pull request #101071 from ju1m/apparmor
...
apparmor: try again to fix and improve
2021-04-24 11:24:26 +00:00
Jörg Thalheim
c534a8434f
nixos-install: fix flake command
2021-04-24 11:49:59 +02:00
github-actions[bot]
f9e9e425fc
Merge staging-next into staging
2021-04-24 06:05:32 +00:00
github-actions[bot]
d8d6ba0d2e
Merge master into staging-next
2021-04-24 06:05:30 +00:00
Luke Granger-Brown
4fb91cbafe
Revert "treewide: use auto diskSize for make-disk-image"
...
This reverts commit f3aa040bcb
.
2021-04-24 02:38:36 +00:00
Sandro
e3e6b73701
Merge pull request #119706 from nyanotech/master
...
nixos/printers: fix ensureDefaultPrinter
2021-04-24 03:49:09 +02:00
github-actions[bot]
944e32775d
Merge staging-next into staging
2021-04-24 00:16:20 +00:00
github-actions[bot]
6e7c70d02d
Merge master into staging-next
2021-04-24 00:16:17 +00:00
Aaron Andersen
d734de7e7e
Merge pull request #119914 from evils/vnstat
...
nixos.vnstat: homedir -> statedir
2021-04-23 19:23:17 -04:00
Evils
7ff0ccc324
nixos/vnstat: homedir -> statedir
...
before, a nixos update that didn't trigger the chmod would break vnstat
and use a vnstatd group
2021-04-24 00:31:58 +02:00
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
davidak
fabdd46503
kbdKeymaps: remove
...
dvp and neo are now included in kbd
includes documentation in release notes and alias
2021-04-23 16:41:06 +02: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
Julien Moutinho
b42a0e205d
nixos/apparmor: disable killUnconfinedConfinables by default
2021-04-23 07:20:20 +02:00