From 7984c28fe585dee4d4417e8313be8e036942e4af Mon Sep 17 00:00:00 2001 From: th33xitus Date: Sun, 11 Jul 2021 19:13:37 +0200 Subject: [PATCH] script: add more default trusted_clients to moonraker.conf template the previous method of adding the host network range was too unreliable in some cases and didn't cover some popular usecases --- resources/moonraker.conf | 8 ++++++-- scripts/install_moonraker.sh | 8 +++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/resources/moonraker.conf b/resources/moonraker.conf index c8f9a10..6496655 100644 --- a/resources/moonraker.conf +++ b/resources/moonraker.conf @@ -9,10 +9,14 @@ klippy_uds_address: %UDS% [authorization] trusted_clients: - 127.0.0.1 %LAN% - ::1/128 + 10.0.0.0/8 + 127.0.0.0/8 + 169.254.0.0/16 + 172.16.0.0/12 + 192.168.0.0/16 FE80::/10 + ::1/128 cors_domains: *.lan *.local diff --git a/scripts/install_moonraker.sh b/scripts/install_moonraker.sh index 4b095ef..5a9f973 100755 --- a/scripts/install_moonraker.sh +++ b/scripts/install_moonraker.sh @@ -277,7 +277,13 @@ create_moonraker_conf(){ sed -i "s|%LOG%|$LOG_PATH|" $MR_CONF sed -i "s|%MR_DB%|$MR_DB|" $MR_CONF sed -i "s|%UDS%|$KLIPPY_UDS|" $MR_CONF - sed -i "s|%LAN%|$LAN|" $MR_CONF + # if host ip is not in the default ip ranges, replace placeholder + # otherwise remove placeholder from config + if ! grep $LAN $MR_CONF; then + sed -i "s|%LAN%|$LAN|" $MR_CONF + else + sed -i "/%LAN%/d" $MR_CONF + fi sed -i "s|%USER%|${USER}|g" $MR_CONF ok_msg "moonraker.conf created!" else