From 2b00e0399973178ec06b5e43673c0345a6a2895a Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Wed, 1 Jul 2026 17:55:30 +0100 Subject: pulls out uninstall to openrc.mk --- Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b00474b..3a14e68 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,6 @@ MAKE_MODULES := $(foreach module,$(MODULES),\ # FUNCTIONS # ############# -openrc_module_target = $(if $(filter $(COMPOSE_SERVICES),$(module)),~/.config/rc/init.d/joeac.net.$(module)) install_submake_file = $(shell [ -f "$(module)/install.mk" ] && echo "$(module)/install.mk") define make_module_rule = @@ -51,12 +50,7 @@ endef define uninstall_module_rule = .PHONY: uninstall_$(module) -uninstall_$(module): - $(if $(openrc_module_target),\ - rc-service -U joeac.net.$(module) stop \ - rc-update -U del joeac.net.$(module) default \ - rm ~/.config/rc/init.d/joeac.net.$(module) \ - ) +uninstall_$(module): uninstall_openrc_$(module) $(if $(SUBDOMAIN_$(module)),\ sudo rm -f /etc/nginx/http.d/$(SUBDOMAIN_$(module)).joeac.net.conf; \ $(RESTART_NGINX); \ -- cgit v1.2.3