From cf7d4f80501e326f44e223c955a9fe8762586576 Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Thu, 26 May 2022 22:22:07 +0200 Subject: [PATCH] Universal way of detecting internal ip --- scripts/configure.sh | 2 +- scripts/start.sh | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/configure.sh b/scripts/configure.sh index e6257f0c..7811aded 100755 --- a/scripts/configure.sh +++ b/scripts/configure.sh @@ -24,8 +24,8 @@ LSB="$(lsb_release -is)" systemctl start docker.service systemctl enable docker.service -# If we are on Arch # if [[ "${LSB}" == "Arch" ]]; then +# sudo "${ROOT_FOLDER}"/scripts/pacapt -S hostname -y # fi # Create configured status diff --git a/scripts/start.sh b/scripts/start.sh index fe3fe34d..b771d0d5 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -55,7 +55,10 @@ fi ROOT_FOLDER="$($readlink -f $(dirname "${BASH_SOURCE[0]}")/..)" STATE_FOLDER="${ROOT_FOLDER}/state" SED_ROOT_FOLDER="$(echo $ROOT_FOLDER | sed 's/\//\\\//g')" -INTERNAL_IP="$(hostname -I | awk '{print $1}')" + +NETWORK_INTERFACE="$(ip route | grep default | awk '{print $5}')" +INTERNAL_IP="$(ip addr show "${NETWORK_INTERFACE}" | grep "inet " | awk '{print $2}' | cut -d/ -f1)" +# INTERNAL_IP="$(hostname -I | awk '{print $1}')" DNS_IP=9.9.9.9 # Default to Quad9 DNS ARCHITECTURE="$(uname -m)" @@ -159,7 +162,10 @@ echo "Running system-info.sh..." bash "${ROOT_FOLDER}/scripts/system-info.sh" # Add crontab to run system-info.sh every minute -! (crontab -l | grep -q "${ROOT_FOLDER}/scripts/system-info.sh") && (crontab -l; echo "* * * * * ${ROOT_FOLDER}/scripts/system-info.sh") | crontab - +! (crontab -l | grep -q "${ROOT_FOLDER}/scripts/system-info.sh") && ( + crontab -l + echo "* * * * * ${ROOT_FOLDER}/scripts/system-info.sh" +) | crontab - ## Don't run if config-only if [[ ! $ci == "true" ]]; then