Undo some changes to vpn-tinc

2 files changed, 44 insertions, 39 deletions

diff --git a/data.d/vpn-tinc/hosts/ricui_tyil_net b/data.d/vpn-tinc/hosts/ricui_tyil_net
index 7bcb34b..0018657 100644
--- a/data.d/vpn-tinc/hosts/ricui_tyil_net
+++ b/data.d/vpn-tinc/hosts/ricui_tyil_net
@@ -1,14 +1,17 @@
+Subnet = 10.57.20.7/32
+Subnet = fd68:1057:1992:3381:0:1:1:2/128
+
 
 -----BEGIN RSA PUBLIC KEY-----
-MIICCgKCAgEAztm8ob3uW18DYA8pve4JDimwKud8SA9UjjqN4NJ0zWuW2YZhu2dT
-c1jrC3kkZbuERQJ6yVUZioFQEpsnABT39nY+oODRLnEFEnoaED45WtAq3LQmSCGd
-PnxV1m5FOWexzQcov41f19FAYPpsDKRLTXP62AOC+NwiZd7es4jWSGWDn8dQdyEc
-oTVAZi/f2tvQGBiqVAPqZvILj2TEXYLnjoUbam6reSZpUc/AWvk+RLhHSLWttQ8h
-rA6dN1W98/gs3/tBF9i3C32UhyOd+W5/ycuZl5hDIAmzCIKYvqlZi+d5ncZrFNmQ
-5WWPBMbIBPyCd+qfDWgL3DJAYGjm6TEGrrVb3m2KkJCCeApCTHDM0j1ldua9GiYY
-JuViKr45HFEEXGGhLPghM2uzHuNe2lim/Ohbx9OjizdaVHXYVxdFdnaESg/J+Ve8
-T/YDb7rG2RsTUrIMlBs0RdjAkrrLlWnvw+QcQUre1cH6vx+fjdXiTqDY4iSR9nmi
-8rq1skgHCt6i5Up6x7KKr1N8fmm6EICne9qhFoaWblW2LT67xwQjVdQKjBHmRv7Y
-808SN4NM6EeRpVSTTMFIZ6iyOlvxIy5PJbX9LkdBdkgrnR3I91SrvRgFbgVd5ScI
-axTTzmaTLYMRWkN/N5kknaE5YqOf31FEk4WCfUIOhb34tNy/7CEAx/MCAwEAAQ==
+MIICCgKCAgEA3d5Kb3dOU9qaDko7jbmSwQ8heCVdJtNYV5biGDoqz4KdxFafsDKD
+Fd/kH2YnquqSDmtHwxX3fIovnV3PQExqXPTbDWUa5WjR5HOi9JZUIjlyY1YJol6G
+KY0c3YHUB0D1qiZCo07vCO+E/RNxeS/GYtugVwEQD9DeIzI8uTOYx+cCEzn6XSbV
+bEZ02cBjgjx0CctBEDKl9dVTzKc/ijSU/U4MtUbC5u5OnyL0+E7uzU05Yc1ucHuY
+QcchyYZ/o9liNXQ3K680KHnnYiy4ywOD/9hLOTMC5fKtoSp2s+Q5e7Fjy3AXrVY2
+xgywp3id2VOdbvcOPDwxrzLIj0ndjNAlPG4P6y3XTloe3wkKawXIl1mtcolIsl8u
+stfXSU5S+JQa3M2tFpJKPQUYdjq+jbc/O7epNQWbMzd5N/EyG42fcP0gV6MWGzoA
+Ns+/JePxzToD/FlXAXqoS+1DFPBxM7O+CjEGjFc0wPCATR8jGzOyHBaMaYgjbkaZ
+KI+uvtusAjDLR9NPHsaqLNURUcVs5ZLTYtUfHD2vyL6njbJlKVgnqcID34hbXF6k
+FZ8k0CH3QWzmS5ZTBLD95i4uL48cYIf/4vuapYigzntaxUju1azejMN7ACMZm2iQ
+hIA1TfNVsrMLTNjfiMqgvXSUfa3MtoBU7OrVEuyDQRJJuw+mwecwms8CAwEAAQ==
 -----END RSA PUBLIC KEY-----
diff --git a/playbooks.d/vpn-tinc/playbook.bash b/playbooks.d/vpn-tinc/playbook.bash
index c163949..6a6a957 100644
--- a/playbooks.d/vpn-tinc/playbook.bash
+++ b/playbooks.d/vpn-tinc/playbook.bash
@@ -11,6 +11,9 @@ playbook_add()
 	local data
 	local etc
 	local host
+	local iptool
+	local ipv4
+	local ipv6
 	local name
 	local tinc
 	local tincd
@@ -18,14 +21,22 @@ playbook_add()
 	data="$(playbook_path "data")"
 	etc="$(config "fs.etcdir")/tinc/tyilnet"
 	host="$(tr "." "_" <<< "${BASHTARD_PLATFORM[fqdn]}")"
+	ipv4="$(config "$BASHTARD_PLAYBOOK.ipv4")"
+	ipv6="$(config "$BASHTARD_PLAYBOOK.ipv6")"
 	name="$(config "$BASHTARD_PLAYBOOK.name")"
 	tinc="$(config "app.tinc")"
 	tincd="$(config "app.tincd")"
 
+	case "${BASHTARD_PLATFORM[key]}" in
+		freebsd) iptool=ifconfig ;;
+		*)       iptool=ip
+	esac
+
 	info "$BASHTARD_PLAYBOOK/add" "Installing tinc"
 	pkg install "tinc"
 
 	info "$BASHTARD_PLAYBOOK/add" "Creating tinc configuration at $etc"
+
 	mkdir -pv -- \
 		"$etc" \
 		"$etc/hosts"
@@ -34,6 +45,25 @@ playbook_add()
 		"name=$host" \
 		> "$etc/tinc.conf"
 
+	file_template "tinc-up-$iptool" \
+		"ip4=$ipv4" \
+		"ip6=$ipv6" \
+		> "$etc/tinc-up"
+
+	file_template "tinc-down-$iptool" \
+		"ip4=$ipv4" \
+		"ip6=$ipv6" \
+		> "$etc/tinc-down"
+
+	file_template "host" \
+		"ip4=$ipv4" \
+		"ip6=$ipv6" \
+		> "$etc/hosts/$host"
+
+	chmod +x \
+		"$etc/tinc-up" \
+		"$etc/tinc-down"
+
 	info "$BASHTARD_PLAYBOOK/add" "Generating private keys"
 
 	case "$($tincd --version | awk '{ print $3 }' | head -n1)" in
@@ -89,42 +119,14 @@ playbook_sync()
 	local hash
 	local host
 	local iptool
-	local ipv4
-	local ipv6
 	local name
 
 	data="$(playbook_path "data")"
 	etc="$(config "fs.etcdir")/tinc/$(config "$BASHTARD_PLAYBOOK.name")"
 	hash="$(dir_hash "$etc/hosts")"
 	host="$(tr "." "_" <<< "${BASHTARD_PLATFORM[fqdn]}")"
-	ipv4="$(config "$BASHTARD_PLAYBOOK.ipv4")"
-	ipv6="$(config "$BASHTARD_PLAYBOOK.ipv6")"
 	name="$(config "$BASHTARD_PLAYBOOK.name")"
 
-	case "${BASHTARD_PLATFORM[key]}" in
-		freebsd) iptool=ifconfig ;;
-		*)       iptool=ip
-	esac
-
-	file_template "tinc-up-$iptool" \
-		"ip4=$ipv4" \
-		"ip6=$ipv6" \
-		> "$etc/tinc-up"
-
-	file_template "tinc-down-$iptool" \
-		"ip4=$ipv4" \
-		"ip6=$ipv6" \
-		> "$etc/tinc-down"
-
-	file_template "host" \
-		"ip4=$ipv4" \
-		"ip6=$ipv6" \
-		> "$etc/hosts/$host"
-
-	chmod +x \
-		"$etc/tinc-up" \
-		"$etc/tinc-down"
-
 	info "$BASHTARD_PLAYBOOK" "Regenerating tinc hosts"
 	rm -fr -- "$etc/hosts"
 	mkdir -p -- "$etc/hosts"