janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

defs-dist.mk: Run jw-apache from /etc/jw-apache instead of /etc/apache2

Browse source 
/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 <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-10-27 16:14:28 +00:00
commit 17b2c48a62
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/defs-dist.mk
View file

@ -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