[omd-commits] OMD Git: omd: apache24 requires IncludeOptional

git version control git at mathias-kettner.de
Wed Jul 16 22:22:46 CEST 2014


Module:   omd
Branch:   master
Commit:   bc2341a47dcac22af6b409f01df94584179723a3
URL:      http://omdistro.org/projects/omd/repository/revisions/bc2341a47dcac22af6b409f01df94584179723a3

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Sat Jul 12 20:18:01 2014 +0200
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Wed Jul 16 13:32:44 2014 +0200

apache24 requires IncludeOptional

otherwise it refused to start with no sites

---

 packages/apache-omd/Makefile             |    6 ++++++
 packages/{omd => apache-omd}/apache.conf |    0
 packages/apache-omd/apache24.conf        |    2 ++
 packages/omd/Makefile                    |    1 -
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/apache-omd/Makefile b/packages/apache-omd/Makefile
index 76fc0ff..e73ff82 100644
--- a/packages/apache-omd/Makefile
+++ b/packages/apache-omd/Makefile
@@ -55,6 +55,12 @@ build: $(APACHE_MODULES)
 
 install: $(APACHE_MODULES_INSTALL)
 	# Install software below $(DESTDIR)$(OMD_ROOT)/{bin,lib,share}
+	mkdir -p $(DESTDIR)$(OMD_ROOT)/share/omd
+	if [ $(APACHE_24_OR_NEWER) -eq 1 ]; then \
+		install -m 644 apache24.conf $(DESTDIR)$(OMD_ROOT)/share/omd/apache.conf; \
+	else \
+		install -m 644 apache.conf $(DESTDIR)$(OMD_ROOT)/share/omd/apache.conf; \
+	fi
 
 skel:
 	if [ $(CENTOS_WORKAROUND) -eq 1 ]; then \
diff --git a/packages/omd/apache.conf b/packages/apache-omd/apache.conf
similarity index 100%
rename from packages/omd/apache.conf
rename to packages/apache-omd/apache.conf
diff --git a/packages/apache-omd/apache24.conf b/packages/apache-omd/apache24.conf
new file mode 100644
index 0000000..116852d
--- /dev/null
+++ b/packages/apache-omd/apache24.conf
@@ -0,0 +1,2 @@
+# Include Apache configuration of OMD sites
+IncludeOptional /omd/apache/*.conf
diff --git a/packages/omd/Makefile b/packages/omd/Makefile
index b92a7d4..dc6040f 100644
--- a/packages/omd/Makefile
+++ b/packages/omd/Makefile
@@ -18,7 +18,6 @@ install:
 	install -m 644 omd.8 $(DESTDIR)$(OMD_ROOT)/share/man/man8
 	gzip $(DESTDIR)$(OMD_ROOT)/share/man/man8/omd.8
 	install -m 755 omd.init $(DESTDIR)$(OMD_ROOT)/share/omd/omd.init
-	install -m 644 apache.conf $(DESTDIR)$(OMD_ROOT)/share/omd/apache.conf
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/share/doc/$(NAME)
 	install -m 644 COPYING AUTHORS $(DESTDIR)$(OMD_ROOT)/share/doc/$(NAME)
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/omd



More information about the omd-commits mailing list