From 17b2c48a62aa90b94a8c7025e5367aa69bd4f2da Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 27 Oct 2018 16:14:28 +0000 Subject: [PATCH] defs-dist.mk: Run jw-apache from /etc/jw-apache instead of /etc/apache2 /etc/apache2 is relatively crowded, because lots of packages dump their default configuration there, which makes the apache service configuration hard to control. This commit makes most apache2-reliant services by janware rely on jw-apache instead, and have jw-apache keep its own configuration directory /etc/jw-apache. Some hand-picked config files are still included from /etc/jw-apache/conf.d/etc-apache2.conf. Signed-off-by: Jan Lindemann --- make/defs-dist.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/defs-dist.mk b/make/defs-dist.mk index 73da838d..d513120b 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -21,8 +21,8 @@ SYSCFG_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT_DIRNAME) LD_CONF_DIR ?= $(ENV_PREFIX)/etc/ld.so.conf.d LOGROT_DIR ?= $(ENV_PREFIX)/etc/logrotate.d -APACHE_CONF_DIR ?= $(ENV_PREFIX)/etc/apache2/conf.d -APACHE_VHOSTS_DIR?= $(ENV_PREFIX)/etc/apache2/vhosts.d +APACHE_CONF_DIR ?= $(ENV_PREFIX)/etc/jw-apache/conf.d +APACHE_VHOSTS_DIR?= $(ENV_PREFIX)/etc/jw-apache/vhosts.d RSYSLOG_DIR ?= $(ENV_PREFIX)/etc/rsyslog.d IMG_PREFIX ?= $(PREFIX) LOG_PREFIX ?= $(ENV_PREFIX)/var/log