From f637e0163b518a8a0f71ede654b437ee768b2c20 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Sun, 22 May 2022 17:50:18 +0200 Subject: [PATCH] refactor: keep nginx configs a user might have configs with customized content set up. blindly removing them with moonraker feels wrong. Signed-off-by: Dominik Willner th33xitus@gmail.com --- scripts/moonraker.sh | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/scripts/moonraker.sh b/scripts/moonraker.sh index 0705990..1b9018b 100644 --- a/scripts/moonraker.sh +++ b/scripts/moonraker.sh @@ -469,16 +469,6 @@ function remove_moonraker_polkit() { ok_msg "Done!" } -#TODO this is technically not moonraker but rather webinterface related configs, so this should be refactored. -function remove_moonraker_nginx() { - if [[ -e "${NGINX_CONFD}/upstreams.conf" || -e "${NGINX_CONFD}/common_vars.conf" ]]; then - status_msg "Removing Moonraker NGINX configuration ..." - sudo rm -f "${NGINX_CONFD}/upstreams.conf" "${NGINX_CONFD}/common_vars.conf" - ok_msg "Moonraker NGINX configuration removed!" - fi -} - - function remove_moonraker() { remove_moonraker_sysvinit remove_moonraker_systemd @@ -487,10 +477,9 @@ function remove_moonraker() { remove_moonraker_polkit remove_moonraker_dir remove_moonraker_env - remove_moonraker_nginx - local confirm="Moonraker was successfully removed!" - print_confirm "${confirm}" && return + print_confirm "Moonraker was successfully removed!" + return } #==================================================#