diff --git a/signalk/config.json b/signalk/config.json index f0874cecd..bb443cc9f 100644 --- a/signalk/config.json +++ b/signalk/config.json @@ -54,6 +54,6 @@ "udev": true, "url": "https://github.com/alexbelgium/hassio-addons", "usb": true, - "version": "2.13.1-test2", + "version": "2.13.1-test3", "webui": "http://[HOST]:[PORT:3000]" } diff --git a/signalk/rootfs/etc/cont-init.d/99-run.sh b/signalk/rootfs/etc/cont-init.d/99-run.sh index 984744698..7e55f6724 100755 --- a/signalk/rootfs/etc/cont-init.d/99-run.sh +++ b/signalk/rootfs/etc/cont-init.d/99-run.sh @@ -3,30 +3,20 @@ set -e # hadolint ignore=SC2155 -# Variables -USER=root - # Set configuration directory -if [ -d "/home/$USER/.signalk" ]; then - rm -r "/home/$USER/.signalk" -fi -ln -sf /config "/home/$USER/.signalk" -chown -R "$USER:$USER" /config -chown -R "$USER:$USER" "/home/$USER/.signalk" -if [ -f /config/.signalk/ssl-key.pem ]; then - chmod -600 /config/.signalk/ssl-key.pem -fi -if [ -f /config/.signalk/ssl-cert.pem ]; then - chmod -600 /config/.signalk/ssl-cert.pem +mkdir -p /config/.signalk +if [ -d "/home/node/.signalk" ]; then + cp -rnf /home/node/.signalk/* /config/.signalk/ + rm -r "/home/node/.signalk" fi +ln -sf /config "/home/node/.signalk" -# Define permissions for /dev/ttyUSB -for device in /dev/ttyUSB /dev/ttyUSB0 /dev/ttyUSB1; do - if [ -e "$device" ]; then - sudo usermod -a -G root node || true +# Set single user for ssl files +for files in ssl-key.pem ssl-cert.pem; do + if [ -f /config/.signalk/"$files" ]; then + chmod -600 /config/.signalk/"$files" fi done bashio::log.info "Starting application" - /./home/node/signalk/startup.sh