From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Fri, 21 Feb 2020 16:38:36 +0000 (+0100)
Subject: Renumber post-Wireguard.
X-Git-Url: https://git.sesse.net/?p=ultimatescore;a=commitdiff_plain;h=123dcff2b9848d7bf41edc080cfdee64032d964a

Renumber post-Wireguard.
---

diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua
index 566b465..6bfa1c1 100644
--- 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 5ef112e..5d81cfc 100755
--- 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