diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-12 19:45:20 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-12 19:45:20 +0100 |
| commit | 74d102ce50f5d71e193a27b899e96739dadeed2f (patch) | |
| tree | 333dadf38ed34c5d783422b0d6b9f0c03a2b4a58 /nixos | |
| parent | 2c237f6180dc06bdd5214ac5216c7e42e5c0d5b1 (diff) | |
| parent | 12c5150ee5702e3d87049e88f58f35cc88e0dccf (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/nix-serve.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/tasks/network-interfaces.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix index f37be31270b7c..8c4352bc95e82 100644 --- a/nixos/modules/services/networking/nix-serve.nix +++ b/nixos/modules/services/networking/nix-serve.nix @@ -67,6 +67,8 @@ in }; config = mkIf cfg.enable { + nix.settings.extra-allowed-users = [ "nix-serve" ]; + systemd.services.nix-serve = { description = "nix-serve binary cache server"; after = [ "network.target" ]; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index d976f9951bb55..298add13437a0 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -498,7 +498,7 @@ in option will result in an evaluation error if the hostname is empty or no domain is specified. - Modules that accept a mere `networing.hostName` but prefer a fully qualified + Modules that accept a mere `networking.hostName` but prefer a fully qualified domain name may use `networking.fqdnOrHostName` instead. ''; }; |