Make the roster scripts executable.

[ultimatescore] / ultimate.sh

diff --git a/ultimate.sh b/ultimate.sh
index a06a1d31e17e041cf1b21a68cb361040b4489270..b2b1b20559500ac0637a0072b61417d16ed3e2c5 100755 (executable)
--- a/ultimate.sh
+++ b/ultimate.sh
@@ -5,7 +5,7 @@ if ! [ -d /srv/ultimate/opptak ]; then
        sudo mount /dev/disk/by-uuid/af9070b1-ba86-4240-83b3-8b866b86a46b /srv/ultimate
 fi
 
        sudo mount /dev/disk/by-uuid/af9070b1-ba86-4240-83b3-8b866b86a46b /srv/ultimate
 fi
 

-if ! ping -c 1 -t 1 10.42.1.1 >/dev/null; then
+if ! ping -c 1 -t 2 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
        echo "Wireguard tunnel is not working (cannot ping 10.42.1.1), please fix before starting streaming."
        exit
 fi


@@ -15,6 +15,7 @@ for DEV in $( ip link | grep UP | cut -d" " -f2 | cut -d: -f1 | cut -d@ -f1 | gr
        sudo tc qdisc add root dev $DEV fq
 done
 echo bbr | sudo tee /proc/sys/net/ipv4/tcp_congestion_control
        sudo tc qdisc add root dev $DEV fq
 done
 echo bbr | sudo tee /proc/sys/net/ipv4/tcp_congestion_control

+sudo ethtool -K enp0s31f6 tx off  # takes iperf from 750 to 920 mbit/sec!?

 
 # Make sure CSS is up-to-date
 sass score.scss score.css
 
 # Make sure CSS is up-to-date
 sass score.scss score.css


@@ -27,7 +28,7 @@ fi
 # Start Nageru
 ( cd /home/sesse/dev/nageru/obj &&
  ./nageru \
 # Start Nageru
 ( cd /home/sesse/dev/nageru/obj &&
  ./nageru \

-       -c 6 \
+       -c 8 \

        -t /home/sesse/dev/ultimatescore/nageru/ultimate.lua \
        -M /home/sesse/dev/ultimatescore/nageru/ultimate.mapping \
        -r /srv/ultimate/opptak \
        -t /home/sesse/dev/ultimatescore/nageru/ultimate.lua \
        -M /home/sesse/dev/ultimatescore/nageru/ultimate.mapping \
        -r /srv/ultimate/opptak \


@@ -40,8 +41,11 @@ fi
        --x264-bitrate 4500 \
        --http-audio-bitrate 128 \
        --quick-cut-keys \
        --x264-bitrate 4500 \
        --http-audio-bitrate 128 \
        --quick-cut-keys \

-       --mjpeg-export-cards=1-5 \
-       -m 0,1 -m 1,2 -m 2,3 -m 3,4 -m 4,5 -m 5,0
+        --output-card 7 \
+        --output-card-unsynchronized \
+       --mjpeg-export-cards=0-3,5-6 \
+       #--mjpeg-export-cards=1-5 \
+       #-m 0,1 -m 1,2 -m 2,3 -m 3,4 -m 4,5 -m 5,0

        #-m 0,2 -m 1,3 -m 2,4 -m 3,5 -m 4,0 -m 5,1 \
 )
 
        #-m 0,2 -m 1,3 -m 2,4 -m 3,5 -m 4,0 -m 5,1 \
 )