1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-02 13:59:07 +03:00
Commit graph

26212 commits

Author SHA1 Message Date
Evils
e6fe2eb0ed nixos/tuptime: 5.2.2 renamed option -x to -q 2023-01-21 21:01:26 +01:00
Peter Waller
678eed323f nixos/grub: Name initrd-secrets by system, not by initrd
Previously, secrets were named according to the initrd they were
associated with. This created a problem: If secrets were changed whilst
the initrd remained the same, there were two versions of the secrets
with one initrd. The result was that only one version of the secrets would
by recorded into the /boot partition and get used. AFAICT this would
only be the oldest version of the secrets for the given initrd version.

This manifests as #114594, which I found frustrating while trying to use
initrd secrets for the first time. While developing the secrets I found
I could not get new versions of the secrets to take effect.
Additionally, it's a nasty issue to run into if you had cause to change
the initrd secrets for credential rotation, etc, if you change them and
discover you cannot, or alternatively that you can't roll back as you
would expect.

Additional changes in this patch.

* Add a regression test that switching to another grub configuration
  with the alternate secrets works. This test relies on the fact that it
  is not changing the initrd. I have checked that the test fails if I
  undo my change.

* Persist the useBootLoader disk state, similarly to other boot state.
  * I had to do this, otherwise I could not find a route to testing the
    alternate boot configuration. I did attempt a few different ways of
    testing this, including directly running install-grub.pl, but what
    I've settled on is most like what a user would do and avoids
    depending on lots of internal details.
  * Making tests that test the boot are a bit tricky (see hibernate.nix
    and installer.nix for inspiration), I found that in addition to
    having to copy quite a bit of code I still couldn't get things to
    work as desired since the bootloader state was being clobbered.

My change to persist the useBootLoader state could break things,
conceptually. I need some help here discovering if that is the case,
possibly by letting this run through a staging CI if there is one.

Fix #114594.

cc potential reviewers:

@lopsided98 (original implementer) @joachifm (original reviewer),
@wkennington (numerous fixes to grub-install.pl), @lheckemann (wrote
original secrets test).
2023-01-21 17:19:26 +00:00
Naïm Favier
363158603a nixos: fix backticks in Markdown descriptions 2023-01-21 18:08:38 +01:00
guangtao
6c46078aad nixos/nomad: add LoadCredential option 2023-01-21 06:09:22 -08:00
Jan Tojnar
5c87c72c1f nixos/init-script: fix eval
error: attribute 'nixos' missing

This was missed in d3528cdc3d
2023-01-21 13:26:47 +01:00
Guillaume Girol
90c78aee6c Merge branch 'nativeCheckInputs' into staging-nativeCheckInputs 2023-01-21 12:00:00 +00:00
Charlotte Van Petegem
f8a3c4e94f
nixos/grafana-image-renderer: use grafana freeform settings in provisioning 2023-01-21 10:16:41 +01:00
Aaron Andersen
ad161ee67c
Merge pull request #206099 from sweenu/add-goeland-module
nixos/goeland: init
2023-01-20 23:06:12 -05:00
Wei Tang
ec8d74d58a
nixos/systemd-confinement: remove unused rootName 2023-01-20 22:39:16 +01:00
zowoq
37a44ff3a0 nixos/nix-fallback-paths: 2.12.0 -> 2.13.1 2023-01-21 06:44:18 +10:00
Guillaume Girol
cb73862665 Revert "nixos/nginx: validate syntax of config file at build time"
This reverts commit a768871934.

This is too fragile, it breaks at least on:
* ssl dh params
* hostnames in proxypass and upstreams are resolved in the sandbox
2023-01-20 20:10:19 +01:00
Guillaume Girol
ecb06398e7 Revert "nixos/nginx: disable configuration validation for now"
This reverts commit 7ef58bce9d.
2023-01-20 20:07:47 +01:00
Michele Guerini Rocco
10222e1e37
Merge pull request #211295 from rnhmjoj/pr-nixos-install
nixos-install: remove root requirement for bind mount
2023-01-20 18:34:38 +01:00
Bruno Inec
dbbb062d47
Apply suggestion
Co-authored-by: Aaron Andersen <aaron@fosslib.net>
2023-01-20 14:39:35 +01:00
Luflosi
2dfc86b838
nixos/modprobe: fix typo in boot.modprobeConfig.enable documentation
This typo was introduced in f4d8e64bed.
Also remove the dot at the end of the sentence since otherwise there would be two dots in the documentation.
2023-01-20 13:58:15 +01:00
Sandro
fe34a633e8
Merge pull request #204287 from Artturin/addmorenox 2023-01-20 13:37:52 +01:00
Thomas Watson
8f2babd032 nixos/systemd-boot: pass EFI variable flags during update too
On some systems, EFI variables are not supported or otherwise wonky.
bootctl attempting to access them causes failures during bootloader
installations and updates. For such systems, NixOS provides the options
`boot.loader.efi.canTouchEfiVariables` and
`boot.loader.systemd-boot.graceful` which pass flags to bootctl that
change whether and how EFI variables are accessed.

Previously, these flags were only passed to bootctl during an install
operation. However, they also apply during an update operation, which
can cause the same sorts of errors. This change passes the flags during
update operations as well to prevent those errors.

Fixes https://github.com/NixOS/nixpkgs/issues/151336
2023-01-19 23:52:57 -06:00
Thomas Watson
8736edfd95 nixos/qemu-vm: fix useBootLoader builds on aarch64-linux
The aarch64-linux kernel and initrd recently eclipsed 60M, causing the
boot disk image build to run out of space and fail. Double the size of
the image to 120M to fix the issue.

The disk image is stored in expandable qcow2 format, so only the space
actually used by files in the image is consumed. Therefore, other
architectures are not unfairly penalized, and the output size does not
suddenly double.

This also fixes NixOS tests which use this option, like systemd-boot's.
2023-01-19 23:28:01 -06:00
Nick Cao
cd5c34bb18
Merge pull request #188795 from Sohalt/oci-containers-wait-for-network
nixos/oci-containers: wait for network before starting container
2023-01-20 09:11:19 +08:00
Artturin
9a34bb217e
nixos/no-x-libs: add more replacements
all-packages: change -nox overrides to callPackage's so there is no
infinite recursion when replacing the package with a overlay
2023-01-20 00:45:37 +01:00
Bruno Inec
edb6b10966
add warning if not using password_file 2023-01-20 00:39:34 +01:00
Bruno Inec
5edf9bd76f
Apply suggestion
Co-authored-by: Aaron Andersen <aaron@fosslib.net>
2023-01-20 00:39:34 +01:00
Bruno Inec
15414ff8e1
databaseDirectory -> StateDir and changed description 2023-01-20 00:39:33 +01:00
Bruno Inec
8f10857af4
let systemd handle /var/lib/goeland creation 2023-01-20 00:39:32 +01:00
Bruno Inec
988feead01
nixos/goeland: init 2023-01-20 00:39:31 +01:00
Izorkin
058951e85d
nixos/installer/cd-dvd: removing duplicate nixpkgs 2023-01-19 22:52:45 +03:00
rnhmjoj
4ed9893770
nixos/systemd-boot: improve initrd-secrets error messages
This is the equivalent of eccc1e5b but for systemd-boot
2023-01-19 20:50:17 +01:00
rnhmjoj
2bc5625877
nixos-install: remove root requirement for bind mount
This moves the creation of the bind mount inside the `nixos-enter`
invocation. The command are executed in an unshared mount namespace, so
they can be run as an unprivileged user.
2023-01-19 20:50:17 +01:00
Vladimir Pouzanov
631b7f6f88 Add support for the other shells 2023-01-19 16:59:11 +00:00
Vladimir Pouzanov
59296fbbc3 Assert that fish configuration is enabled if any user has fish as their shell.
Suggested-By: matthiasbeyer
2023-01-19 16:28:54 +00:00
guangtao
b5a3f795c3 nixos/nomad: fix multi-plugin-dir path 2023-01-18 22:22:43 -08:00
Naïm Favier
556a4a7951 nixos/installation-cd-minimal: include HTML doc
Although we don't really need HTML documentation in the minimal installer,
not including it may cause annoying cache misses in the case of the NixOS manual.
2023-01-19 00:30:33 +01:00
Pascal Bach
e229ca64d0
Merge pull request #211005 from AtaraxiaSjel/nixos/gitea-zstd
nixos/gitea: add tar.zst to the dump type
2023-01-18 09:22:38 +01:00
Ryan Lahfa
eb6d457115
Merge pull request #209246 from e1mo/dokuwiki/package-overriding
dokuwiki: Combine mechanism for plugins and templates
2023-01-18 00:51:18 +01:00
K900
860f1b67da
Merge pull request #198287 from K900/kpackage-fix
nixos/plasma5: make kpackage able to resolve dependencies
2023-01-17 21:46:42 +03:00
Jonas Heinrich
e8731b8778
Merge pull request #210701 from onny/wordpress-settings
nixos/wordpress: add settings option
2023-01-17 19:38:17 +01:00
Martin Weinelt
5770984a95
Merge pull request #211252 from schnusch/systemd-user-tmpfiles-rules
nixos: systemd: systemd.user.tmpfiles.users add default
2023-01-17 17:41:41 +00:00
talyz
2d4f4e9bdf
nixos/gitlab: Handle secrets in GitLab Pages config 2023-01-17 17:34:47 +01:00
talyz
dbd563b9b8
nixos/gitlab: Improve support for GitLab Pages
- provide options and set defaults for important settings
- generate the shared secret
- reenable gitlab-pages in test
2023-01-17 17:33:47 +01:00
schnusch
f0f2c6bec9 nixos: systemd: systemd.user.tmpfiles.users add default 2023-01-17 16:53:45 +01:00
Florian Klink
24b4189619
Merge pull request #207468 from schnusch/systemd-user-tmpfiles-rules
nixos: systemd: add systemd.user.tmpfiles.rules, systemd.user.tmpfiles.users.<name>.rules
2023-01-17 14:39:44 +01:00
schnusch
34ad8447c3 nixos: systemd: add systemd.user.tmpfiles 2023-01-17 12:19:40 +01:00
Naïm Favier
cd4f1a1df5
nixos-install: only mount if root 2023-01-17 11:39:34 +01:00
Maximilian Bosch
91054ce6ce
Merge pull request #207748 from blargg/wiki-js
nixos/wiki-js: Add git and openssh to the wiki-js service path to enable git backups.
2023-01-17 08:35:58 +01:00
Nick Cao
8f34f01185
Merge pull request #194343 from oxalica/fix/swap-btrfs
nixos/swap: fix creation on BTRFS and refactor assertions
2023-01-17 08:35:15 +08:00
Sandro
8986570cb3
Merge pull request #208956 from SuperSandro2000/profile-base-tcpdump 2023-01-17 01:20:31 +01:00
Tom Jankauski
eef1f70919 nixos/wiki-js: Add git and openssh to enable git backups. 2023-01-16 16:04:40 -08:00
Michele Guerini Rocco
594b94b4c3
Merge pull request #210812 from rnhmjoj/pr-initrd-secrets
boot.initrd.secrets fixes
2023-01-17 00:48:58 +01:00
oxalica
87a0c9490d nixos/swap: fix creation on BTRFS and refactor assertions 2023-01-17 06:47:21 +08:00
Jeff Huffman
96ec8c7623 nixos/documentation.man.mandb: Add skipPackages option, and include nixos-version
prevents unnecessary recreation of man caches

Fixes #209835
2023-01-16 22:24:02 +01:00