diff --git a/lgsm/modules/info_distro.sh b/lgsm/modules/info_distro.sh index 8c29a4ca2..ee84d39f2 100644 --- a/lgsm/modules/info_distro.sh +++ b/lgsm/modules/info_distro.sh @@ -73,7 +73,12 @@ for distro_info in "${distro_info_array[@]}"; do fi done -# some RHEL based distros use 8.4 instead of just 8. +# Get virtual environment +if [ "$(command -v systemd-detect-virt 2> /dev/null)" ]; then + virtualenvironment="$(systemd-detect-virt)" +fi + +# Some RHEL based distros use 8.4 instead of just 8. if [[ "${distroidlike}" == *"rhel"* ]] || [ "${distroid}" == "rhel" ]; then distroversioncsv="${distroversionrh}" else diff --git a/lgsm/modules/info_game.sh b/lgsm/modules/info_game.sh index 5a7eb5942..2bfdc10e7 100644 --- a/lgsm/modules/info_game.sh +++ b/lgsm/modules/info_game.sh @@ -2397,20 +2397,6 @@ else extip="$(cat "${tmpdir}/extip.txt")" fi -# Country code of external IP address -if [ ! -f "${tmpdir}/countrycode.txt" ]; then - countrycode="$(curl --connect-timeout 10 -s https://ipapi.co/country 2> /dev/null)" - exitcode=$? - # if curl passes add extip to externalip.txt - if [ "${exitcode}" == "0" ]; then - echo "${countrycode}" > "${tmpdir}/countrycode.txt" - else - echo "Unable to get external IP address" - fi -else - countrycode="$(cat "${tmpdir}/countrycode.txt")" -fi - # Alert IP address if [ "${displayip}" ]; then alertip="${displayip}" diff --git a/lgsm/modules/info_stats.sh b/lgsm/modules/info_stats.sh index ac145a37f..f012efeb2 100644 --- a/lgsm/modules/info_stats.sh +++ b/lgsm/modules/info_stats.sh @@ -82,7 +82,8 @@ curl -X POST "https://www.google-analytics.com/mp/collect?api_secret=A-OzP02TSMW \"uuidhardware\": \"${uuidhardware}\", \"uuidinstall\": \"${uuidinstall}\", \"uuidinstance\": \"${uuidinstance}\", - \"version\": \"${version}\" + \"version\": \"${version}\", + \"virtualenvironment\": \"${virtualenvironment}\" } } ] @@ -108,7 +109,8 @@ curl -i -X POST https://stats.linuxgsm.com/api/event \ \"servercpufreq\": \"${cpufreqency} x${cpucores}\", \"serverdisk\": \"${totalspace}\", \"serverram\": \"${physmemtotal}\", - \"version\": \"${version}\" + \"version\": \"${version}\", + \"virtualenvironment\": \"${virtualenvironment}\" }" ## Alert Stats.