summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data.d/vpn-wireguard/qohrei.tyil.net6
-rw-r--r--hosts.d/qohrei.tyil.net2
-rw-r--r--registry.d/qohrei.tyil.net1
3 files changed, 9 insertions, 0 deletions
diff --git a/data.d/vpn-wireguard/qohrei.tyil.net b/data.d/vpn-wireguard/qohrei.tyil.net
index 0d1cd90..a0a2224 100644
--- a/data.d/vpn-wireguard/qohrei.tyil.net
+++ b/data.d/vpn-wireguard/qohrei.tyil.net
@@ -1,4 +1,10 @@
[Peer]
+<<<<<<< Updated upstream
AllowedIPs = fd68:1e45:bc6c:4c7b::57:50:1/128
Endpoint = [2a01:4f9:c012:6273::1]:51820
PublicKey = 4BGxVjgNlFKOlomQSfxfsQs7y7hLbcK7iQyBs7Cf5mk=
+=======
+AllowedIPs = fd68:1e45:bc6c:4c7b::/64
+Endpoint = [2a01:4f9:c012:6273::1]:52345
+PublicKey = LY+L8jGdQwn545m71oBazey1QdJliibz1ejf3wpMgy0=
+>>>>>>> Stashed changes
diff --git a/hosts.d/qohrei.tyil.net b/hosts.d/qohrei.tyil.net
new file mode 100644
index 0000000..c64c0aa
--- /dev/null
+++ b/hosts.d/qohrei.tyil.net
@@ -0,0 +1,2 @@
+vpn-wireguard.endpoint=2a01:4f9:c012:6273::1
+vpn-wireguard.ip=fd68:1e45:bc6c:4c7b::57:50:1
diff --git a/registry.d/qohrei.tyil.net b/registry.d/qohrei.tyil.net
new file mode 100644
index 0000000..ea09601
--- /dev/null
+++ b/registry.d/qohrei.tyil.net
@@ -0,0 +1 @@
+vpn-wireguard