wireguard: 0.0.20170421 -> 0.0.20170517 #25646
+15
−15
| @@ -27,18 +27,6 @@ let | |||
| description = "Base64 private key generated by wg genkey."; | |||
| }; | |||
|
|
|||
| presharedKey = mkOption { | |||
| default = null; | |||
| example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I="; | |||
| type = with types; nullOr str; | |||
| description = '' | |||
| base64 preshared key generated by wg genpsk. Optional, | |||
| and may be omitted. This option adds an additional layer of | |||
| symmetric-key cryptography to be mixed into the already existing | |||
| public-key cryptography, for post-quantum resistance. | |||
| ''; | |||
| }; | |||
|
|
|||
| listenPort = mkOption { | |||
| default = null; | |||
| type = with types; nullOr int; | |||
| @@ -98,6 +86,18 @@ let | |||
| description = "The base64 public key the peer."; | |||
| }; | |||
|
|
|||
| presharedKey = mkOption { | |||
| default = null; | |||
| example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I="; | |||
| type = with types; nullOr str; | |||
| description = '' | |||
| base64 preshared key generated by wg genpsk. Optional, | |||
| and may be omitted. This option adds an additional layer of | |||
| symmetric-key cryptography to be mixed into the already existing | |||
| public-key cryptography, for post-quantum resistance. | |||
| ''; | |||
| }; | |||
|
|
|||
| allowedIPs = mkOption { | |||
| example = [ "10.192.122.3/32" "10.192.124.1/24" ]; | |||
| type = with types; listOf str; | |||
| @@ -137,12 +137,12 @@ let | |||
| generateConf = name: values: pkgs.writeText "wireguard-${name}.conf" '' | |||
|
|||
| [Interface] | |||
| PrivateKey = ${values.privateKey} | |||
| ${optionalString (values.presharedKey != null) "PresharedKey = ${values.presharedKey}"} | |||
| ${optionalString (values.listenPort != null) "ListenPort = ${toString values.listenPort}"} | |||
| ${concatStringsSep "\n\n" (map (peer: '' | |||
| [Peer] | |||
| PublicKey = ${peer.publicKey} | |||
| ${optionalString (peer.presharedKey != null) "PresharedKey = ${peer.presharedKey}"} | |||
| ${optionalString (peer.allowedIPs != []) "AllowedIPs = ${concatStringsSep ", " peer.allowedIPs}"} | |||
| ${optionalString (peer.endpoint != null) "Endpoint = ${peer.endpoint}"} | |||
| ${optionalString (peer.persistentKeepalive != null) "PersistentKeepalive = ${toString peer.persistentKeepalive}"} | |||
ProTip!
Use n and p to navigate between commits in a pull request.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
This module should be probably rewritten later to use wg-quick, since it lakes of features like auto-mtu and the default gateway over wireguard trick.