From 40ed315e8840c72c32356a0582d097e1eaeb856b Mon Sep 17 00:00:00 2001
From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 25 Jul 2015 20:04:12 +0200
Subject: [PATCH] baculum: In Makefile split Apache and Lighttpd files to
 separate directories

---
 gui/baculum/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gui/baculum/Makefile b/gui/baculum/Makefile
index c28c79a53e..63eef852be 100644
--- a/gui/baculum/Makefile
+++ b/gui/baculum/Makefile
@@ -20,7 +20,7 @@ datadir = protected
 frameworkdir = framework
 themesdir = themes
 cachedir = assets
-configdir = $(datadir)/Data
+configdir = Data
 configcachedir = $(datadir)/runtime
 samplesdir = examples/$(SAMPLETYPE)
 
@@ -58,8 +58,9 @@ prepare_build:
 	$(DESTDIR)$(CACHEDIR) \
 	$(DESTDIR)$(LOCALEDIR) \
 	$(DESTDIR)$(WWWDIR)/$(cachedir) \
-	$(DESTDIR)$(WWWDIR)/$(configdir) \
 	$(DESTDIR)$(WWWDIR)/$(configcachedir)
+	mkdir -m 700 -p $(DESTDIR)$(CONFDIR)/$(configdir)-apache \
+	$(DESTDIR)$(CONFDIR)/$(configdir)-lighttpd
 
 prepare_data: prepare_build
 	mkdir -p $(DESTDIR)$(WWWDIR)/$(datadir)
@@ -86,7 +87,10 @@ prepare_samples:
 	install -m 640 $(samplesdir)/$(NAME)-lighttpd.conf $(DESTDIR)$(CONFDIR)
 	install -m 644 $(samplesdir)/$(NAME)-lighttpd.service $(DESTDIR)$(UNITDIR)
 	install -m 640 $(samplesdir)/$(NAME)-apache.conf $(DESTDIR)$(HTTPDCONFDIR)/$(NAME).conf
-	install -m 600 $(samplesdir)/$(NAME).users $(DESTDIR)$(WWWDIR)/$(configdir)
+	install -m 600 $(samplesdir)/$(NAME).users $(DESTDIR)$(CONFDIR)/$(configdir)-lighttpd
+	install -m 600 $(samplesdir)/$(NAME).users $(DESTDIR)$(CONFDIR)/$(configdir)-apache
+	# Default link apache config file
+	ln -s $(DESTDIR)$(CONFDIR)/$(configdir)-apache $(DESTDIR)$(WWWDIR)/$(datadir)/$(configdir)
 
 setup: prepare_samples
 	sed -i -e "s#%DOCUMENTROOT#$(WWWDIR)#g" -e "s#%LOGDIR#$(HTTPDLOGS)#g" $(DESTDIR)$(HTTPDCONFDIR)/$(NAME).conf
-- 
2.39.5