From 5eb3a5d1fec239526af91871d3aa61e0d4614786 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Thu, 17 Dec 2020 09:39:15 +0100
Subject: [PATCH] [viwib] updates

---
 openwrt/viwib-2-configure.sh | 10 ++++-----
 openwrt/viwib-3-vpn.sh       |  8 +------
 openwrt/viwib-4-cleanup.sh   | 42 ++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 13 deletions(-)
 create mode 100755 openwrt/viwib-4-cleanup.sh

diff --git a/openwrt/viwib-2-configure.sh b/openwrt/viwib-2-configure.sh
index d1f28be..59eb7e5 100755
--- a/openwrt/viwib-2-configure.sh
+++ b/openwrt/viwib-2-configure.sh
@@ -180,12 +180,6 @@ uci set firewall.@zone[1].network='wan wan6 wg0'
 
 uci commit
 
-# Remove our ssh keys
-rm -f /etc/dropbear/authorized_keys
-
-# Setup root password
-printf "${root_password}\n${root_password}\n" | passwd
-
 reboot
 EOF
 
@@ -202,3 +196,7 @@ while ! ping -c5 ${viwib_ip}; do
     echo "Waiting for viwib ${id}"
     sleep 2
 done
+
+echo "Wireguard public key and id: ${id} ${public_key}"
+echo "Root password: ${root_password}"
+echo ${public_key} > ${viwib_hostname}.public_key
diff --git a/openwrt/viwib-3-vpn.sh b/openwrt/viwib-3-vpn.sh
index 36ee375..7e2d4a8 100755
--- a/openwrt/viwib-3-vpn.sh
+++ b/openwrt/viwib-3-vpn.sh
@@ -64,13 +64,7 @@ while [ $i -lt 10 ]; do
 done
 
 i=0
-while [ $i -lt 10 ]; do
+while [ $i -lt 30 ]; do
     ping -c1 ${my_lan_ip} && break
     i=$((i+1))
 done
-
-i=0
-while [ $i -lt 10 ]; do
-    ping -c1 ${my_wifi_ip} && break
-    i=$((i+1))
-done
diff --git a/openwrt/viwib-4-cleanup.sh b/openwrt/viwib-4-cleanup.sh
new file mode 100755
index 0000000..5ed6c95
--- /dev/null
+++ b/openwrt/viwib-4-cleanup.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+# Nico Schottelius
+# 2020-06-14
+
+set -e
+set -x
+
+if [ $# -ne 2 ]; then
+    echo "$0 viwib-ip-address viwib-id"
+    echo "    viwib-ip-address: where to find the viwib"
+    echo "    viwib-id: number in decimal format"
+    exit 1
+fi
+
+viwib_ip=$1; shift
+
+id=$1; shift
+viwib_hostname=viwib${id}
+
+root_password=$(pwgen -1 32)
+
+# Save for sending to user
+# FIXME: future make this more easy / better to transfer
+echo $root_password > ${viwib_hostname}.rootpw
+
+cat <<EOF | ssh -t "root@${viwib_ip}"
+# Remove temporary IP
+
+# Correct test SSID to final one
+uci set wireless.default_radio0.ssid='IPv6 everywhere'
+uci commit
+
+# Remove our ssh keys
+rm -f /etc/dropbear/authorized_keys
+
+# Setup root password
+printf "${root_password}\n${root_password}\n" | passwd
+
+reboot
+EOF
+
+echo "Submit to user the root password = ${root_password}"