From a2b6727c4f5e469025ace0439c8438ece8b8112d Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 19 Jul 2021 21:52:51 +0200 Subject: [PATCH 1/5] viwib: upgrade to 19.07.7 --- openwrt/viwib-1-firmware-upgrade.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/openwrt/viwib-1-firmware-upgrade.sh b/openwrt/viwib-1-firmware-upgrade.sh index 245f6ec..d864323 100755 --- a/openwrt/viwib-1-firmware-upgrade.sh +++ b/openwrt/viwib-1-firmware-upgrade.sh @@ -8,6 +8,7 @@ if [ $# -ne 1 ]; then exit 1 fi +set -e set -x viwib_ip=$1; shift From 438dce61c67e1dea46049e614deea654f7776481 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 19 Jul 2021 21:52:59 +0200 Subject: [PATCH 2/5] ++debug --- openwrt/viwib-4-cleanup.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openwrt/viwib-4-cleanup.sh b/openwrt/viwib-4-cleanup.sh index 5ed6c95..8359c61 100755 --- a/openwrt/viwib-4-cleanup.sh +++ b/openwrt/viwib-4-cleanup.sh @@ -2,8 +2,6 @@ # Nico Schottelius # 2020-06-14 -set -e -set -x if [ $# -ne 2 ]; then echo "$0 viwib-ip-address viwib-id" @@ -12,6 +10,9 @@ if [ $# -ne 2 ]; then exit 1 fi +set -e +set -x + viwib_ip=$1; shift id=$1; shift From fc2aa93d5e49d648c7b58773aaa9082ed2cae021 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 19 Jul 2021 21:53:26 +0200 Subject: [PATCH 3/5] [openwrt] update mjpeg streamer --- .../openwrt-add-camera-with-mjpg-streamer.sh | 50 ++++--------------- 1 file changed, 11 insertions(+), 39 deletions(-) diff --git a/openwrt/openwrt-add-camera-with-mjpg-streamer.sh b/openwrt/openwrt-add-camera-with-mjpg-streamer.sh index 25d98a8..3235c00 100755 --- a/openwrt/openwrt-add-camera-with-mjpg-streamer.sh +++ b/openwrt/openwrt-add-camera-with-mjpg-streamer.sh @@ -27,47 +27,19 @@ uci set mjpg-streamer.core.enabled=1 uci set mjpg-streamer.core.resolution="1920x1080" uci delete mjpg-streamer.core.username uci delete mjpg-streamer.core.password + +if ! uci show firewall | grep "name='Allow-Camera'"; then +uci add firewall rule +uci set firewall.@rule[-1].name='Allow-HTTP' +uci set firewall.@rule[-1].src='wan' +uci set firewall.@rule[-1].proto='tcp' +uci set firewall.@rule[-1].dest_port='8080' +uci set firewall.@rule[-1].target='ACCEPT' +fi + uci commit + /etc/init.d/mjpg-streamer restart EOF - -exit 0 - - -# This is old code / when we used motion - -cat < /etc/motion.conf < Date: Mon, 19 Jul 2021 21:53:55 +0200 Subject: [PATCH 4/5] [openwrt] set -e does not work for updates --- openwrt/viwib-1-firmware-upgrade.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/openwrt/viwib-1-firmware-upgrade.sh b/openwrt/viwib-1-firmware-upgrade.sh index d864323..245f6ec 100755 --- a/openwrt/viwib-1-firmware-upgrade.sh +++ b/openwrt/viwib-1-firmware-upgrade.sh @@ -8,7 +8,6 @@ if [ $# -ne 1 ]; then exit 1 fi -set -e set -x viwib_ip=$1; shift From 4c3147c1b2363150ab6fc74ac48d9aae3902d71e Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sun, 25 Jul 2021 10:48:25 +0200 Subject: [PATCH 5/5] Add script to configure k8s vms --- k8s/configure-k8s-vms.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 k8s/configure-k8s-vms.sh diff --git a/k8s/configure-k8s-vms.sh b/k8s/configure-k8s-vms.sh new file mode 100755 index 0000000..e83c513 --- /dev/null +++ b/k8s/configure-k8s-vms.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# Nico Schottelius +# 2021-07-25 + +if [ $# -lt 1 ]; then + echo "$0 cdist-workdir list-of-ipv6-addresses-of-vms" + exit 1 +fi + +workdir=$1; shift + +names="" + +for vm in "$@"; do + # get name and remove trailing dot + name=$(dig +short -x $vm | sed 's/\.$//') + names="$names $name" +done + +cd "${workdir}" +cdist config -vv -j6 -p30 ${names}