iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add prom monitoring
[automated-distro-installer]
/
wrt-setup
diff --git
a/wrt-setup
b/wrt-setup
index 7d3416bcd1d308d32d2b03e4ba307f4b553c853d..1e0d6362befbc4d56a9d1352cbf901f632cb0538 100755
(executable)
--- a/
wrt-setup
+++ b/
wrt-setup
@@
-19,6
+19,8
@@
set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+[[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
+
x="$(readlink -f "$BASH_SOURCE")"; cd ${x%/*}
usage() {
x="$(readlink -f "$BASH_SOURCE")"; cd ${x%/*}
usage() {
@@
-66,14
+68,16
@@
if [[ ! $h ]]; then
esac
fi
esac
fi
-echo "$0: h
ost
=$h"
-
-cat ~/.ssh/
home
.pub | ssh $h dd of=/etc/dropbear/authorized_keys 2>/dev/null
+echo "$0: h=$h"
+# todo: ecdsa key not working with dropbear
+cat ~/.ssh/
{h,hrsa,home}
.pub | ssh $h dd of=/etc/dropbear/authorized_keys 2>/dev/null
scp /a/work/libremanage/libremanage /a/bin/fai/wrt-init /a/bin/fai/wrt-setup-local /a/bin/cedit/cedit $h:/usr/bin
# relay is built for openwrt 18.06.2, r7676-cddd7b4c77
scp /a/work/libremanage/libremanage /a/bin/fai/wrt-init /a/bin/fai/wrt-setup-local /a/bin/cedit/cedit $h:/usr/bin
# relay is built for openwrt 18.06.2, r7676-cddd7b4c77
-sudo scp /q/root/shadow/router /p/c/machine_specific/wrt/etc/dropbear/dropbear_rsa_host_key \
- /a/opt/openwrt/source/bin/packages/mips_24kc/mypackages/relay_1.0-1_mips_24kc.ipk \
+
+#/a/opt/openwrt/source/bin/packages/mips_24kc/mypackages/relay_1.0-1_mips_24kc.ipk \
+
+scp /q/root/shadow/router /p/c/machine_specific/wrt/etc/dropbear/dropbear_rsa_host_key \
/p/router-secrets /p/c/machine_specific/wrt/etc/wg.{key,psk} $h:
scp ../openwrtkeyring/usign/* $h:/etc/opkg/keys
/p/router-secrets /p/c/machine_specific/wrt/etc/wg.{key,psk} $h:
scp ../openwrtkeyring/usign/* $h:/etc/opkg/keys
-ssh $h wrt-init $
HOME_DOMAIN
"$@"
+ssh $h wrt-init $
{HOME_DOMAIN:-b8.nz}
"$@"