summaryrefslogtreecommitdiffstats
path: root/retiolum
diff options
context:
space:
mode:
Diffstat (limited to 'retiolum')
-rw-r--r--retiolum/hosts/rubus11
-rwxr-xr-xretiolum/scripts/tinc_setup/new_install.sh12
2 files changed, 17 insertions, 6 deletions
diff --git a/retiolum/hosts/rubus b/retiolum/hosts/rubus
new file mode 100644
index 00000000..0ba98c0d
--- /dev/null
+++ b/retiolum/hosts/rubus
@@ -0,0 +1,11 @@
+Subnet = 10.243.137.174
+Subnet = 42:7941:278b:bd29:f0ab:9c09:e5e9:7965
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAznS+XyF278SXTVgK9OG8SDu+pffDZtBeYfyyNHAVt/2EeE3cfIJZ
+3iBXMcD8/yelCWMY6S+MNNnP+KqyCCVuG8rvhpMjB/RGzqLFSTLZoQOmC/O9S3i3
+TKKr4zxyBxjSFAPSOeHbrERAyREg/GNrLxX/SzT/yOgRDjZLA1Z5CgunXVeiB7BF
+9jL1U6AahFD/6NzaPAc4+mSAQJzGw4P5TeVvAlhf96x5I0sBc09Vu87sL9NJOpi8
+hqWYhLWjZF4CRusjV3SL9kUj668CZO1S9Ooe3FO37Pa0fftDLQekCpBDrtoNr6LW
+O2BYBEXsQn5ooZgAysm7mi9Hbdc3dPl5/QIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index 7433d7b1..1d16cfb9 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -334,7 +334,7 @@ AutoConnect = 3
#ConnectTos
ConnectTo = supernode
-ConnectTo = euer
+ConnectTo = pigstarter
ConnectTo = pico
EOF
@@ -346,17 +346,17 @@ if type ip >/dev/null; then
echo '' >> tinc-up
echo 'conf=$dirname/tinc.conf' >> tinc-up
echo '' >> tinc-up
- echo 'name=$(sed -n "s|^ *Name *= *\([^ ]*\) *$|\1|p " $conf)' >> tinc-up
+ echo 'name=$(sed -n "s|^ *Name *= *\([^ ]*\) *$|\\1|p" $conf)' >> tinc-up
echo '' >> tinc-up
echo 'host=$dirname/hosts/$name' >> tinc-up
echo '' >> tinc-up
echo 'ip link set $INTERFACE up' >> tinc-up
echo '' >> tinc-up
- echo "addr4=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET4[.][^ ]*\\) *$|\\1|p\" \$host)" >> tinc-up
+ echo "addr4=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET4[.][^ ]*\\) *\$|\\\\1|p\" \$host)" >> tinc-up
echo 'ip -4 addr add $addr4 dev $INTERFACE' >> tinc-up
echo "ip -4 route add $FULLSUBNET/$MASK4 dev \$INTERFACE" >> tinc-up
echo '' >> tinc-up
- echo "addr6=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET6[:][^ ]*\\) *$|\\1|p\" \$host)" >> tinc-up
+ echo "addr6=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET6[:][^ ]*\\) *\$|\\\\1|p\" \$host)" >> tinc-up
echo 'ip -6 addr add $addr6 dev $INTERFACE' >> tinc-up
echo "ip -6 route add $SUBNET6::/$MASK6 dev \$INTERFACE" >> tinc-up
else
@@ -364,11 +364,11 @@ else
echo '' >> tinc-up
echo 'conf=$dirname/tinc.conf' >> tinc-up
echo '' >> tinc-up
- echo 'name=$(sed -n "s|^ *Name *= *\([^ ]*\) *$|\1|p " $conf)' >> tinc-up
+ echo 'name=$(sed -n "s|^ *Name *= *\([^ ]*\) *$|\\1|p" $conf)' >> tinc-up
echo '' >> tinc-up
echo 'host=$dirname/hosts/$name' >> tinc-up
echo '' >> tinc-up
- echo "addr4=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET4[.][^ ]*\\) *$|\\1|p\" \$host)" >> tinc-up
+ echo "addr4=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET4[.][^ ]*\\) *$|\\\\1|p\" \$host)" >> tinc-up
echo 'ifconfig $INTERFACE $addr4' >> tinc-up
echo "route add -net $FULLSUBNET netmask $RMASK dev \$INTERFACE " >> tinc-up
fi