Renumber post-Wireguard.

diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua
index 566b465c65c1be8784e4ff258ccc252819752414..6bfa1c1988319175d2485e9c20db1f20a454982f 100644 (file)
--- a/nageru/ultimate.lua
+++ b/nageru/ultimate.lua
@@ -1,6 +1,6 @@
 -- Nageru theme for TFK mini-tournament 2017, based on the default theme.
 
-local futatabi_server = "http://10.1.0.172:9096"
+local futatabi_server = "http://10.42.0.2:9096"
 
 local state = {
        transition_start = -2.0,

diff --git a/ultimate.sh b/ultimate.sh
index 5ef112e3c0ad5de38a5bbd72d1065ec5ec9f2dbc..5d81cfc9572f406d41e230feae266ec0c7a0c6b8 100755 (executable)
--- a/ultimate.sh
+++ b/ultimate.sh
@@ -5,14 +5,13 @@ if ! [ -d /srv/ultimate/opptak ]; then
        sudo mount /dev/disk/by-uuid/af9070b1-ba86-4240-83b3-8b866b86a46b /srv/ultimate
 fi
 
-if ! pidof ssh > /dev/null; then
-       echo "Set up SSH forwarding forwarding before running this script:"
-       echo "  ssh -R 9095:127.0.0.1:9095 stream@pannekake.samfundet.no"
+if ! ping -c 1 -t 1 10.42.1.1 >/dev/null; then
+       echo "Wireguard tunnel is not working (cannot ping 10.42.1.1), please fix before starting streaming."
        exit
 fi
 
 # Set up BBR
-for DEV in $( ip link | grep UP | cut -d" " -f2 | cut -d: -f1 | grep -v lo ); do
+for DEV in $( ip link | grep UP | cut -d" " -f2 | cut -d: -f1 | cut -d@ -f1 | grep -v lo ); do
        sudo tc qdisc add root dev $DEV fq
 done
 echo bbr | sudo tee /proc/sys/net/ipv4/tcp_congestion_control