diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-24 12:01:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-24 12:01:00 +0000 |
| commit | b6d5fc29bcdc28e8685141815a20ca95ea6189d8 (patch) | |
| tree | a18982733d21a865d1df025c583ceac556ae2826 /nixos | |
| parent | 83ab82d09a92d9ccad5e7f2ed73a4e46b7c675fd (diff) | |
| parent | 6c661d378a7178e248d457adfc5d8340b03ade8c (diff) | |
| download | nixlib-b6d5fc29bcdc28e8685141815a20ca95ea6189d8.tar nixlib-b6d5fc29bcdc28e8685141815a20ca95ea6189d8.tar.gz nixlib-b6d5fc29bcdc28e8685141815a20ca95ea6189d8.tar.bz2 nixlib-b6d5fc29bcdc28e8685141815a20ca95ea6189d8.tar.lz nixlib-b6d5fc29bcdc28e8685141815a20ca95ea6189d8.tar.xz nixlib-b6d5fc29bcdc28e8685141815a20ca95ea6189d8.tar.zst nixlib-b6d5fc29bcdc28e8685141815a20ca95ea6189d8.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/wg-quick.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/wg-quick.nix b/nixos/modules/services/networking/wg-quick.nix index 34210580f538..68e0e06d0469 100644 --- a/nixos/modules/services/networking/wg-quick.nix +++ b/nixos/modules/services/networking/wg-quick.nix @@ -17,6 +17,8 @@ let type = with types; nullOr str; description = lib.mdDoc '' wg-quick .conf file, describing the interface. + Using this option can be a useful means of configuring WireGuard if + one has an existing .conf file. This overrides any other configuration interface configuration options. See wg-quick manpage for more details. ''; |