From efcc08a470f4e531dba2727eeef6c7bbfce43955 Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Fri, 5 Apr 2024 21:55:17 +0200 Subject: Rejoin plarabe into tinc --- data.d/vpn-tinc/hosts/plarabe_tyil_net | 28 +++++++++++++++------------- hosts.d/plarabe.tyil.net | 4 ++-- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/data.d/vpn-tinc/hosts/plarabe_tyil_net b/data.d/vpn-tinc/hosts/plarabe_tyil_net index 0d2a970..91acd8c 100644 --- a/data.d/vpn-tinc/hosts/plarabe_tyil_net +++ b/data.d/vpn-tinc/hosts/plarabe_tyil_net @@ -1,16 +1,18 @@ -Subnet = 10.57.100.10/32 -Subnet = fd68:1057:1992:3381:0:3317:0:3 +Port = 657 + +Subnet = 10.57.0.3/32 +Subnet = fd68:1057:1992:3381:0:0:3317:3/128 -----BEGIN RSA PUBLIC KEY----- -MIICCgKCAgEAvply9cPmEi7zqZEqIEYpTisk+OJvIOXhEL1uwz3ntf8z/1CjG7bq -lGCtgwEx4ilQ4M4JUp5Y+7DSt2JQmpzfunQszhVNSNIBm57iLM7pkhfr6LEXglfW -eGe8nFv4Kph8D+N0kY9xdRIMDCDxvcsdaMcnjCBs+NoGXeF0Yl2Z1pXw0jU4bAe4 -JfXT/AvuvOrBTXVZ+vzqiKbOCxJRK6gWeyfs3gnHTgSQ2eOjyYFOLkTAxnYmFLkO -DPkhQ/s1QviqYFgvJ0of99Q9WnyK7Ki1w5Wx46qoh05ic9FwJ5/AV/1s83TDvUfD -YiVtsdLQxwZcsiXfLa1whisDRy0z93CrnzrVOTEncxo3tGu+Fmz43h5NgQLnIxKq -EWT7SOA0yvyynNRpWmav7XEfWMFJAw08Cz3hlCK+nYAL9w92PIMOVxGQ9QpWcQTb -bxkKNF9A08GKUb3OHjxM3Va+7f4/Ju8fQJ5Ce7UvGAaoWIVSIdO/bWtaKBLpSNou -kgvpyyuOCAMfBFD1c44m8pqtHBfkM6dH5Yp55dV4Q249/E5r/6nErwBYtAcUdRcu -9Tchbc5nLynfRwmG8xVG+sNS/Vmp3S0BFVzqrnmKvB3j5GqU2GZIP7TcWgzf+Y4t -E5mGIbAjTSw7DCqodMzl8MDQqSaauB5rSpy+TfFnw3dsImQyfXN7Lm8CAwEAAQ== +MIICCgKCAgEAsasMofIk6AxtX7wsNYf1rZy+tpnnrRrQMX6/kXri+DhMByURJ1HI +i7jhKBjQBfIcj5FijHHUQHiiKx0bNR0ekpXQFPcsRrspXdQEUnYkc1Pb1J0OMNQ+ +9CT/DH2sun+Zk3qHE+GLdDoWe6gz4uT8Eh+c1/6Z5VwxFpSYKRwT5T/wU9OOEqJi +svoLZSZUh57Xq2y+3JJvfPx3LS6UP9mwz6cmvLWAkRBn18WG81ZBXvN/4ida23o8 +qhaxDhYIO20lDKY+in2oiN1qztLPcQKiXdn/R3ATr8dZ3pPm8YMclnH4Uil10IAw +sl7B7Zt/As/LxklCdwWvPLcRMPC7bAMTGRMFW89C9APY3FsfRD5oiX3jqUMDLw6p +UIVt6/gxnXBjyfgVFouG2ThrqGJp+sC3TfEEjBQ38/W8zk7S3IwMEqLd0gBc8Yq7 +QUWbORloNvv4CtwkeYFonM0eoYn9euxuXJ7RSBGzXadqkKiwtsG4rsvaLU+LKQnQ +xRdzyiEZFcACU5/bdydHXYWWX1xfD2dPsW0nOelvJukgJvNWn0HyCZ1uClTdcAOr +/m3Wh4clCiYgDfvurdVKRmgzzG/5U+xih+SUjgDnf/zgfOViY30BzRxoeWvJ+bCH +TfMKk85a/Zdxxqosasoq6tMlt7EKhPDX5FmL/T102BB40Wtz4U3b81cCAwEAAQ== -----END RSA PUBLIC KEY----- diff --git a/hosts.d/plarabe.tyil.net b/hosts.d/plarabe.tyil.net index 8a8ef11..1145dd7 100644 --- a/hosts.d/plarabe.tyil.net +++ b/hosts.d/plarabe.tyil.net @@ -1,4 +1,4 @@ bashtard.ssh.host=10.57.100.10 meta.provider=self -vpn-tinc.ipv4=10.57.100.10 -vpn-tinc.ipv6=fd68:1057:1992:3381:0:3317:0:3 +vpn-tinc.ipv4=10.57.0.3 +vpn-tinc.ipv6=fd68:1057:1992:3381:0:0:3317:3 -- cgit v1.1