From 85841e45cce5e21de1ef5c07b5f6ce6d41154c5c Mon Sep 17 00:00:00 2001
From: Manevolent <manevolent@team.lixo>
Date: Tue, 21 Sep 2021 15:08:09 -0600
Subject: [PATCH] Version changes before going to master
---
README.md | 8 +++++---
wireguard/wg0.conf | 8 ++++++++
2 files changed, 13 insertions(+), 3 deletions(-)
create mode 100644 wireguard/wg0.conf
diff --git a/README.md b/README.md
index d7ab31e..059e0b5 100644
--- a/README.md
+++ b/README.md
@@ -185,8 +185,10 @@ These settings are optional, and are already defaulted to general network common
#### Wireguard options
-Keep in mind that Wireguard is presently an auxilliary satellite connection point. Because of this, you shouldn't re-use any IP addresses related to WG.
+Keep in mind that Wireguard is presently an auxilliary satellite connection point. Because of this, you shouldn't re-use any IP addresses related to WG. Consider planning a piece (/32, see `wg_prefix`) of your network (i.e. 172.31.y.z) where `y` is your first network number, i.e. `8` or `16` and `z` is an unused address and setting that to `wg_address`.
- * `wg_key`: The private key to use for the Wireguard peering point
- * `wg_address`: The address to assign to Wireguard, should be unique.
+ * `wg_enabled`: Set to 1 to enable WireGuard. Defaults to 0/disabled.
+ * `wg_key`: Required. The private key to use for the Wireguard peering point.
+ * `wg_address`: Required. The address to assign to the Wireguard interface. Should be unique.
* `wg_prefix`: The prefix to assign to Wireguard, defaults to 32.
+ * `wg_port`: Port for WireGuard to listen to connections on (UDP). Defaults to 51820.
diff --git a/wireguard/wg0.conf b/wireguard/wg0.conf
new file mode 100644
index 0000000..5e060d1
--- /dev/null
+++ b/wireguard/wg0.conf
@@ -0,0 +1,8 @@
+[Interface]
+PrivateKey = ${wg_key}
+Address = ${wg_address}/${wg_prefix:-32}
+
+{{ range files "wireguard/peers" }} {{ if ne . "${tinc_peer_name}" }}
+[Peer]
+{{ include (print "wireguard/peers" .) }}
+{{ end }}{{ end }}
\ No newline at end of file