diff --git a/common/scripts/mesh-helper.sh b/common/scripts/mesh-helper.sh index e2659941a..0e56fb5d4 100644 --- a/common/scripts/mesh-helper.sh +++ b/common/scripts/mesh-helper.sh @@ -49,19 +49,6 @@ generate_br_lan_ip() { local ip_random ip_random="$(echo "$mesh_if_mac" | cut -b 16-17)" br_lan_ip="192.168.1."$((16#$ip_random)) - - - cat > /etc/radvd.conf <<- EOF -interface br-lan { - AdvSendAdvert on; - MinRtrAdvInterval 3; - MaxRtrAdvInterval 10; - prefix 2001:db8:1234:5678::/64 { - AdvOnLink on; - AdvAutonomous on; - }; -}; -EOF } source_configuration() { diff --git a/modules/sc-mesh-secure-deployment/src/nats/initd/S90socat b/modules/sc-mesh-secure-deployment/src/nats/initd/S90socat deleted file mode 100644 index e41316afa..000000000 --- a/modules/sc-mesh-secure-deployment/src/nats/initd/S90socat +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash -### BEGIN INIT INFO -# Provides: S90socat -# Short-Description: socat -# Description: Starts socat to provive IPv6 NATS IF -### END INIT INFO - -DAEMON="socat" -DIR="/usr/bin/" -PIDFILE="/var/run/$DAEMON.pid" -# shellcheck source=/dev/null -[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" -LOG_FILE=/opt/socat.log - -ip=$(ifconfig br-lan | awk '/inet / {print $2}') -ARGS="TCP6-LISTEN:6222,fork,reuseaddr TCP4:$ip:4222" - -start() { - echo "$ARGS" - printf 'Starting %s: ' "$DAEMON" - start-stop-daemon -b -m -S -q -p "$PIDFILE" -a /bin/bash -- -c "exec $DIR$DAEMON \ - $ARGS > $LOG_FILE 2>&1" - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} -stop() { - printf 'Stopping %s: ' "$DAEMON" - start-stop-daemon -K -q -p "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} -restart() { - stop - sleep 1 - start -} -case "$1" in - start|stop|restart) - "$1";; - reload) - # Restart, since there is no true "reload" feature. - restart;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac - -exit 0 - diff --git a/modules/utils/docker/entrypoint_nats.sh b/modules/utils/docker/entrypoint_nats.sh index 77a6dc28d..065933de4 100755 --- a/modules/utils/docker/entrypoint_nats.sh +++ b/modules/utils/docker/entrypoint_nats.sh @@ -48,10 +48,6 @@ else echo "starting nats server" /opt/S90nats_server start - echo "starting radvd & socat" - radvd -C /etc/radvd.conf # TODO: for some reason init.d is not working - /opt/S90socat start # socat is used to provide IPv6 NATS IF - echo "starting comms services" /opt/S90comms_controller start