Procházet zdrojové kódy

Allow local ip addresses for scuttlebot

Bob Mottram před 7 roky
rodič
revize
588c58799f
2 změnil soubory, kde provedl 11 přidání a 0 odebrání
  1. 1
    0
      src/freedombone-image-mesh
  2. 10
    0
      src/freedombone-mesh-batman

+ 1
- 0
src/freedombone-image-mesh Zobrazit soubor

795
     echo '{' > /etc/scuttlebot/.ssb/config
795
     echo '{' > /etc/scuttlebot/.ssb/config
796
     echo "  \"host\": \"${HOSTNAME}\"," >> /etc/scuttlebot/.ssb/config
796
     echo "  \"host\": \"${HOSTNAME}\"," >> /etc/scuttlebot/.ssb/config
797
     echo "  \"port\": ${SCUTTLEBOT_PORT}," >> /etc/scuttlebot/.ssb/config
797
     echo "  \"port\": ${SCUTTLEBOT_PORT}," >> /etc/scuttlebot/.ssb/config
798
+    echo '  "allowPrivate": true,' >> /etc/scuttlebot/.ssb/config
798
     echo '  "timeout": 30000,' >> /etc/scuttlebot/.ssb/config
799
     echo '  "timeout": 30000,' >> /etc/scuttlebot/.ssb/config
799
     echo '  "pub": true,' >> /etc/scuttlebot/.ssb/config
800
     echo '  "pub": true,' >> /etc/scuttlebot/.ssb/config
800
     echo '  "local": true,' >> /etc/scuttlebot/.ssb/config
801
     echo '  "local": true,' >> /etc/scuttlebot/.ssb/config

+ 10
- 0
src/freedombone-mesh-batman Zobrazit soubor

96
     . /etc/default/batctl
96
     . /etc/default/batctl
97
 fi
97
 fi
98
 
98
 
99
+function get_ipv6_bat0 {
100
+    echo $(ip -o -f inet6 addr show dev "bat0" | awk '{print $4}' | awk 'END {print}' | awk -F '/' '{print $1}')
101
+}
102
+
99
 function mesh_hotspot_ip_address {
103
 function mesh_hotspot_ip_address {
100
     echo $(ip -o -f inet addr show dev "$BRIDGE" | awk '{print $4}' | awk 'END {print}' | awk -F '/' '{print $1}')
104
     echo $(ip -o -f inet addr show dev "$BRIDGE" | awk '{print $4}' | awk 'END {print}' | awk -F '/' '{print $1}')
101
 }
105
 }
402
 
406
 
403
     systemctl restart avahi-daemon
407
     systemctl restart avahi-daemon
404
 
408
 
409
+    if [ -f /etc/scuttlebot/.ssb/config ]; then
410
+        ipv6addr=$(get_ipv6_bat0)
411
+        sed -i "s|\"host\": .*|\"host\": \"${ipv6addr}\",|g" /etc/scuttlebot/.ssb/config
412
+        systemctl restart scuttlebot
413
+    fi
414
+
405
     verify
415
     verify
406
 }
416
 }
407
 
417