Commit graph

20807 commits

Author SHA1 Message Date
Vladimír Čunát 0032a3fc81
Merge #100592: nixos/kresd: Fix unportable regex 2021-03-28 20:27:49 +02:00
github-actions[bot] b9456ca263
Merge master into staging-next 2021-03-28 18:14:11 +00:00
oxalica 80a1336bb9 nixos/filesystems: always write mount options for swap devices
According to fstab(5), unlike last two fields `fs_freq` and `fs_passno`,
the 4-th field `fs_mntops` is NOT optional, though it works when omitted.

For best-practice and easier to be parsed by other programs, we should always
write `defaults` as default mount options for swap devices.
2021-03-28 19:54:03 +02:00
Aaron Andersen d6fd7c6613 nixos/zabbixAgent: add a few minor tweaks to make configuration file compatible with both zabbix agent 1 and 2 2021-03-28 13:35:21 -04:00
Linus Heckemann 4aacd02d33
Merge pull request #115792 from ncfavier/patch-2
nixos/stage-1: make cpio quiet
2021-03-28 14:38:46 +02:00
Linus Heckemann 22de3c19e7 graylog: improve JRE handling
Since the upstream graylogctl script will prefer finding its java
executable based on JAVA_HOME, we now set this instead of PATH in
order to allow it to find the JRE. By setting it conditionally on it
not already being set, we allow selecting a different JRE at runtime.

We also explicitly use openjdk11, which supports the
UseConcMarkSweepGC option which graylog insists on using.
2021-03-28 14:37:28 +02:00
github-actions[bot] 732dc6ef8f
Merge master into staging-next 2021-03-28 00:15:41 +00:00
Maximilian Bosch ae73ec2b68
Merge pull request #116738 from Ma27/wiki-js
wiki-js: init at 2.5.191
2021-03-27 22:03:35 +01:00
github-actions[bot] 95c24d591a
Merge master into staging-next 2021-03-27 18:14:08 +00:00
Michele Guerini Rocco b01e00ba8f
Merge pull request #114688 from rnhmjoj/tcsd-no-udev-settle
nixos/tcsd: several improvements and fixes
2021-03-27 16:31:17 +01:00
Pavel Borzenkov 58ce51ed06 nixos/calibre-web: init module 2021-03-27 14:43:33 +03:00
github-actions[bot] 70fb533d57
Merge master into staging-next 2021-03-26 18:13:54 +00:00
Justin Humm 347a9168ae nixos/hledger-web: set capabilites as boolean 2021-03-26 13:45:13 +01:00
Justin Humm 569940b9fd nixos/hledger-web: add stateDir, use own user, fix ExecStart
This allows for shared hledger installations, where the web interface is
available via network and multiple user share a SSH access to the
hledger user.

Also added `--serve` to the CLI options, as hledger-web tries to open a
webbrowser otherwise:

hledger-web: xdg-open: rawSystem: runInteractiveProcess: exec: does not
exist (No such file or directory)

Co-authored-by: Aaron Andersen <aaron@fosslib.net>
2021-03-26 13:45:13 +01:00
github-actions[bot] eddd1a74ec
Merge master into staging-next 2021-03-26 12:06:41 +00:00
Maciej Krüger c8d2f4a3a8 cjdns: reduce password length to 32
Maximum password length per cjdns code is somehwhere less than that, see
ecd01e7681/client/AdminClient.c (L80)

Currently we generate 96 char long passwords that don't work

This changes it so password length is just 32 chars long
2021-03-26 11:35:09 +01:00
Robert Hensing 363d7c86b0
Merge pull request #117603 from lbpdt/fix/docker-tools-layered-image-env
dockerTools.streamLayeredImage: resolve duplicate env vars
2021-03-26 09:52:18 +01:00
github-actions[bot] b068d2e437
Merge master into staging-next 2021-03-26 00:15:53 +00:00
Louis Blin b3f68289df dockerTools.streamLayeredImage: resolve duplicate env vars
For images running on Kubernetes, there is no guarantee on how duplicate
environment variables in the image config will be handled. This seems
to be different from Docker, where the last environment variable value
is consistently selected.

The current code for `streamLayeredImage` was exploiting that assumption
to easily propagate environment variables from the base image, leaving
duplicates unchecked. It should rather resolve these duplicates to
ensure consistent behavior on Docker and Kubernetes.
2021-03-25 23:29:54 +00:00
Florian Klink f3fa3a38a9
Merge pull request #116743 from flokli/bird-check-config-disable
nixos/bird*: enable config files outside the store, propagate reload errors to systemd
2021-03-25 23:01:09 +01:00
github-actions[bot] 4dc869e403
Merge master into staging-next 2021-03-25 12:06:22 +00:00
Domen Kožar b992a92fa0
Merge pull request #117021 from AmineChikhaoui/gcp-cloud-images
add new Google Cloud image for the current release
2021-03-25 10:42:06 +01:00
github-actions[bot] 8cebf1dc19
Merge master into staging-next 2021-03-25 06:05:58 +00:00
Léo Gaspard 219ee8d091
release notes: typo fixes (#117539) 2021-03-25 01:28:41 +01:00
github-actions[bot] eb499aa20e
Merge master into staging-next 2021-03-25 00:17:22 +00:00
kvtb 5e647319ae less.nix: fix escape
$$ does not escape $
\$ does
2021-03-24 23:28:04 +01:00
github-actions[bot] 8e2d0e45c0
Merge master into staging-next 2021-03-24 18:10:39 +00:00
Izorkin f3a032dee5 nixos/mastodon: enable sandbox mode 2021-03-24 17:28:50 +01:00
github-actions[bot] 380cb1e995
Merge master into staging-next 2021-03-24 12:11:57 +00:00
Maximilian Bosch 0ad1d526dc
Merge pull request #117454 from dotlambda/wireguard-noalias
nixos/wireguard: don't use alias
2021-03-24 11:43:13 +01:00
Robert Schütz 683f374529 nixos/wireguard: don't use alias 2021-03-24 11:27:36 +01:00
Robert Hensing 43b02818f6
Merge pull request #117273 from hercules-ci/nixos-dont-format
Don't format XML of the NixOS manual
2021-03-24 11:07:23 +01:00
github-actions[bot] 2417360191
Merge master into staging-next 2021-03-24 00:41:10 +00:00
Benjamin Hipple 561cc81ee6
Merge pull request #115857 from lbpdt/feature/docker-tools-layered-base-image
dockerTools.buildLayeredImage: support fromImage
2021-03-23 18:15:34 -04:00
Robert Hensing e0e241c219
Merge pull request #116369 from m1cr0man/master
nixos/acme: Fix webroot issues
2021-03-23 21:31:42 +01:00
Louis Blin aae8588182 dockerTools.buildLayeredImage: support fromImage
It is now possible to pass a `fromImage` to `buildLayeredImage` and
`streamLayeredImage`, similar to what `buildImage` currently supports.

This will prepend the layers of the given base image to the resulting
image, while ensuring that at most `maxLayers` are used. It will also
ensure that environment variables from the base image are propagated
to the final image.
2021-03-23 14:50:42 +00:00
Robert Hensing 9011d59758 logstash-*-oss: Add passthru.tests 2021-03-23 14:42:40 +01:00
Robert Hensing e7e6e8d5c3 nixos/logstash: Don't set unnecessary JAVA_HOME 2021-03-23 14:42:40 +01:00
github-actions[bot] 963842fb19
Merge master into staging-next 2021-03-23 12:27:46 +00:00
Profpatsch c25ffa8b76
Merge pull request #117073 from sternenseemann/inspircd-3.9.0
inspircd: init at 3.9.0
2021-03-23 11:25:58 +01:00
github-actions[bot] 39e3812215
Merge master into staging-next 2021-03-23 06:18:02 +00:00
Peter Hoeg 6b815bbb99 nixos/systemd: missing a few units for KDE to use systemd 2021-03-23 09:44:34 +08:00
github-actions[bot] 11ee0bf5d7
Merge master into staging-next 2021-03-23 00:40:24 +00:00
Sander van der Burg 8fc9423565
Merge pull request #116455 from svanderburg/systemdunitpath
systemd: allow custom unit folders to be configured with SYSTEMD_UNIT…
2021-03-22 22:58:49 +01:00
Robert Hensing 2f7be87a8a nixos/doc: Update Writing Documentation to use nix-shell 2021-03-22 21:21:08 +01:00
Robert Hensing 12e7698a65 nixos/doc/manual/Makefile: Do not format
Formatting has been neglected. Running `make` would format dozens
of files, which is a great way of scaring away newcomers and those
with less git experience. It would also annoy the heck out of
regular contributors.

The purpose of formatting is to avoid a small annoyance, so it
should not become a big annoyance that makes people give up on
their work.
2021-03-22 21:15:11 +01:00
Sander van der Burg 5c8ed06fc9 systemd: allow custom unit folders to be configured with SYSTEMD_UNIT_PATH 2021-03-22 20:41:12 +01:00
github-actions[bot] 44763c135b
Merge master into staging-next 2021-03-22 18:21:11 +00:00
Bernardo Meurer 9334a29720
Merge pull request #116811 from jansol/pipewire
pipewire: 0.3.23 -> 0.3.24
2021-03-22 17:34:48 +00:00
Robert Hensing bef62e8c81
Merge pull request #114752 from hercules-ci/lazy-offline-acme
acme: Determine offline whether renewal is due
2021-03-22 16:04:33 +01:00
sternenseemann 76d9fe7629 !fixup add myself as maintainer for the module 2021-03-22 15:19:49 +01:00
adisbladis 04a37553f2
Merge pull request #114821 from erosennin/catatonit
catatonit: init at 0.1.5, fix podman --init
2021-03-22 16:04:06 +02:00
sternenseemann 726db56d68 !fixup simplify zipListsWith call 2021-03-22 14:52:13 +01:00
sternenseemann 66454f0e5a !fixup get rid of trailing comment hack 2021-03-22 14:48:38 +01:00
sternenseemann 4048b39fc1 nixos/modules/inspircd: add simplistic module and nixos test 2021-03-22 14:38:57 +01:00
github-actions[bot] feda7be375
Merge master into staging-next 2021-03-22 12:26:55 +00:00
Michele Guerini Rocco a88356cbbe
Merge pull request #97048 from bluecmd/patch-1
nixos/manual: luks entries are auto-detected
2021-03-22 08:15:42 +01:00
github-actions[bot] 8739248897
Merge master into staging-next 2021-03-22 06:22:54 +00:00
Matt McHenry 13bee29b9b restic: allow prune without backup
fixes #97820
2021-03-21 18:47:52 -07:00
Andrey Golovizin fd3f1ec19a nixos/tests/podman: test podman run --init 2021-03-21 21:26:47 +01:00
zowoq 4b11122749 nixos/containers: add catatonit / init_path
https://github.com/containers/common/blob/master/docs/containers.conf.5.md

- Also drop unneeded true from ociSeccompBpfHook
2021-03-21 20:57:28 +01:00
AmineChikhaoui 606b49721f
add new Google Cloud image for the current release
update the create-gce.sh script with the ability to create public images
out of a GS object.
2021-03-21 14:04:09 -04:00
github-actions[bot] 6f6e1d46b4
Merge master into staging-next 2021-03-21 12:26:00 +00:00
Guillaume Girol 584f971216
Merge pull request #113707 from symphorien/sane-backends-udpate
sane-backends: 1.0.30 -> 1.0.32
2021-03-21 11:03:04 +00:00
Symphorien Gibol c20cd1834f sane-backends: 1.0.30 -> 1.0.32
sane-backends-git: remove, it's not updated often enough to be useful
2021-03-21 11:07:14 +01:00
github-actions[bot] b0455cafa7
Merge master into staging-next 2021-03-21 06:17:15 +00:00
Sandro c10752cc4f
Merge pull request #113722 from rgrunbla/galene-03
galene: 0.2 -> 0.3 and bugfix of the associated module
2021-03-21 05:31:30 +01:00
Maximilian Bosch de98a184f5
wiki-js: init at 2.5.191 2021-03-20 20:43:21 +01:00
github-actions[bot] 933682b533
Merge master into staging-next 2021-03-20 18:19:30 +00:00
Jörg Thalheim 1fc14408ae
Merge pull request #108952 from Mic92/systemd-builder
nixos/systemd-boot: add typechecking
2021-03-20 16:05:27 +00:00
Milan 58804b24bc
nixos/gitlab: add option for tls wrapper-mode smtp (#116801) 2021-03-20 15:05:29 +01:00
github-actions[bot] 6e3a55e059
Merge staging-next into staging 2021-03-19 18:19:40 +00:00
Frederik Rietdijk 1ecb97eae9 Merge master into staging-next 2021-03-19 18:17:01 +01:00
edef 7ea4ee71c9
Merge pull request #112822 from deviant/localtime-user-allocation
nixos/localtime: make localtimed a system user
2021-03-19 12:45:58 +00:00
github-actions[bot] 29278dcf45
Merge staging-next into staging 2021-03-19 12:26:59 +00:00
github-actions[bot] c804f22a81
Merge master into staging-next 2021-03-19 12:26:52 +00:00
Sandro 24d3016208
Merge pull request #114016 from oxalica/fix/partition-manager 2021-03-19 13:02:40 +01:00
Alexander Foremny 297b1ba320 Revert "nixos/systemd: Handle template overrides"
This reverts commit e3b90b6ccc.

This commit broke container tests and thus blocked channels from
advancing.
2021-03-19 09:05:33 +01:00
Jan Solanti fbdb248e54 pipewire: 0.3.23 -> 0.3.24 2021-03-19 05:14:44 +02:00
github-actions[bot] 8c03075f07
Merge staging-next into staging 2021-03-19 00:41:08 +00:00
github-actions[bot] d73a492e83
Merge master into staging-next 2021-03-19 00:41:01 +00:00
Niklas Hambüchen 296c47d7b2
Merge pull request #116282 from nh2/programs-turbovnc
turbovnc: Add programs.turbovnc, add test for headless software OpenGL
2021-03-19 01:12:33 +01:00
Jan Tojnar 2445e9a681
Merge branch 'master' into staging-next 2021-03-18 19:24:39 +01:00
markuskowa 2af233afac
Merge pull request #115839 from markuskowa/fix-slurm
nixos/slurm: expose to path config files
2021-03-18 14:48:28 +01:00
Florian Klink 2b03d3a1cf nixos/bird: check config during reload
`birdc configure` seems to not return a nonzero exit code if the reload
failed.

Context: https://bird.network.cz/pipermail/bird-users/2018-January/011858.html

Co-Authored-By: Puck Meerburg <puck@puck.moe>
2021-03-18 14:25:44 +01:00
Florian Klink 7d266264ce nixos/bird: add services.bird*.checkConfig option
This is useful when the config doesn't entirely live in the Nix store,
but is configured to include mutable config files written at runtime.

Co-Authored-By: Puck Meerburg <puck@puck.moe>
2021-03-18 14:24:55 +01:00
Jan Tojnar 0136206b12
Merge branch 'master' into staging-next 2021-03-18 13:35:59 +01:00
Jaakko Luttinen 099a9e809c nixos/update-users-groups: read access to /etc/shadow for group shadow 2021-03-18 00:08:35 -07:00
Aaron Andersen 7cdd6238dd
Merge pull request #109711 from ymarkus/bookstack
bookstack: init at 0.31.7, nixos/bookstack: init
2021-03-17 20:37:03 -04:00
kat 5be8697a33
nixos/sway: further parity between extraPackages default and defaultText
Co-authored-by: Robert Schütz <rschuetz17@gmail.com>
2021-03-17 15:36:31 +00:00
kat witch 102137e359
nixos/sway: fixed defaultText 2021-03-17 13:49:19 +00:00
Raphael Megzari f295110b26
prometheus-postgres-exporter: add environment file (#116373)
* prometheus-postgres-exporter: add environment file

* Update nixos/modules/services/monitoring/prometheus/exporters/postgres.nix

Co-authored-by: WilliButz <WilliButz@users.noreply.github.com>
2021-03-17 01:36:31 +01:00
Florian Klink 68d6ffc8d5
Merge pull request #115549 from adrianparvino/new-nixos-unstable
systemd: Handle template overrides
2021-03-16 23:05:11 +01:00
github-actions[bot] 7302b9368b
Merge staging-next into staging 2021-03-16 18:18:36 +00:00
github-actions[bot] e0a6159fc6
Merge master into staging-next 2021-03-16 18:18:29 +00:00
ajs124 08ebda1a17
Merge pull request #115655 from helsinki-systems/upd/nginx
nginxMainline: 1.19.7 -> 1.19.8
2021-03-16 16:31:55 +01:00
github-actions[bot] 1398d44bac
Merge staging-next into staging 2021-03-16 00:39:16 +00:00
github-actions[bot] d18aaddde4
Merge master into staging-next 2021-03-16 00:39:08 +00:00
Lucas Savva 2dd7973751 nixos/acme: Add permissions tests 2021-03-15 19:25:49 +00:00
Sarah Brofeldt bdc36a0210
Merge pull request #116387 from lf-/doc-fix
manual/installation: s/boot.loader.systemd/boot.loader.systemd-boot
2021-03-15 19:43:27 +01:00