2 May
2019
2 May
'19
11:40 a.m.
Module: check_mk
Branch: master
Commit: cdead9d9a14bc032e33529386bee202765ed9443
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdead9d9a14bc0…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed May 1 20:56:57 2019 +0200
Fix broken dokuwiki
* Fix dokuwiki skel and other skel make targets
* Fix dokuwiki cache directory creation with newer PHP versions
Change-Id: I4b14e3863c7cd6b3ff2a08815c4d8f5306e108c6
---
omd/packages/check_mk/check_mk.make | 5 ++++-
omd/packages/dokuwiki/dokuwiki.make | 5 ++++-
omd/packages/dokuwiki/skel/etc/dokuwiki/local.php | 1 +
omd/packages/omd/omd.make | 6 ++++--
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/omd/packages/check_mk/check_mk.make b/omd/packages/check_mk/check_mk.make
index 3aa9298..2c78311 100644
--- a/omd/packages/check_mk/check_mk.make
+++ b/omd/packages/check_mk/check_mk.make
@@ -3,6 +3,7 @@ DISTNAME := $(CHECK_MK)-$(CMK_VERSION)
CHECK_MK_BUILD := $(BUILD_HELPER_DIR)/$(DISTNAME)-build
CHECK_MK_INSTALL := $(BUILD_HELPER_DIR)/$(DISTNAME)-install
+CHECK_MK_SKEL := $(BUILD_HELPER_DIR)/$(DISTNAME)-skel
CHECK_MK_PATCHING := $(BUILD_HELPER_DIR)/$(DISTNAME)-patching
.PHONY: $(CHECK_MK) $(CHECK_MK)-install $(CHECK_MK)-skel $(CHECK_MK)-clean
@@ -10,6 +11,7 @@ CHECK_MK_PATCHING := $(BUILD_HELPER_DIR)/$(DISTNAME)-patching
$(CHECK_MK): $(CHECK_MK_BUILD)
$(CHECK_MK)-install: $(CHECK_MK_INSTALL)
+$(CHECK_MK)-skel: $(CHECK_MK_SKEL)
# This step creates a tar archive containing the sources
# which are need for the build step
@@ -113,9 +115,10 @@ $(CHECK_MK_INSTALL): $(CHECK_MK_BUILD)
#chmod +x $(DESTDIR)$(OMD_ROOT)/bin/*
$(TOUCH) $@
-$(CHECK_MK)-skel:
+$(CHECK_MK_SKEL): $(CHECK_MK_INSTALL)
$(RM) $(SKEL)/etc/check_mk/main.mk-*
$(RM) $(SKEL)/etc/check_mk/multisite.mk-*
+ $(TOUCH) $@
$(CHECK_MK)-clean:
$(RM) -r check_mk-*.*.*[0-9] werks ChangeLog $(BUILD_HELPER_DIR)/$(CHECK_MK)*
diff --git a/omd/packages/dokuwiki/dokuwiki.make b/omd/packages/dokuwiki/dokuwiki.make
index 1789bdc..d33a33a 100644
--- a/omd/packages/dokuwiki/dokuwiki.make
+++ b/omd/packages/dokuwiki/dokuwiki.make
@@ -5,6 +5,7 @@ DOKUWIKI_DIR = $(DOKUWIKI)-$(DOKUWIKI_VERS)
DOKUWIKI_BUILD := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-build
DOKUWIKI_INSTALL := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-install
DOKUWIKI_UNPACK := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-unpack
+DOKUWIKI_SKEL := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-skel
DOKUWIKI_UNPACK_ADDITIONAL := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-unpack-additional
DOKUWIKI_PATCHING := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-patching
@@ -13,6 +14,7 @@ DOKUWIKI_PATCHING := $(BUILD_HELPER_DIR)/$(DOKUWIKI_DIR)-patching
$(DOKUWIKI): $(DOKUWIKI_BUILD)
$(DOKUWIKI)-install: $(DOKUWIKI_INSTALL)
+$(DOKUWIKI)-skel: $(DOKUWIKI_SKEL)
$(DOKUWIKI_UNPACK_ADDITIONAL): $(DOKUWIKI_UNPACK)
$(TAR_GZ) $(PACKAGE_DIR)/$(DOKUWIKI)/template-arctictut.tgz -C $(DOKUWIKI_DIR)/lib/tpl/
@@ -57,7 +59,7 @@ $(DOKUWIKI_INSTALL): $(DOKUWIKI_BUILD)
# rm -rf $(DESTDIR)$(OMD_ROOT)/etc
# rm -rf $(DESTDIR)$(OMD_ROOT)/var
-$(DOKUWIKI)-skel: $(DOKUWIKI_INSTALL)
+$(DOKUWIKI_SKEL): $(DOKUWIKI_INSTALL)
$(MKDIR) $(SKEL)/etc/dokuwiki
$(MKDIR) $(SKEL)/var/dokuwiki/lib/plugins
cp $(DOKUWIKI_DIR)/conf/*.conf $(SKEL)/etc/dokuwiki/.
@@ -74,6 +76,7 @@ $(DOKUWIKI)-skel: $(DOKUWIKI_INSTALL)
for i in `ls -1 $(DESTDIR)$(OMD_ROOT)/share/dokuwiki/htdocs/lib/plugins/` ; do \
$(LN) -s ../../../../share/dokuwiki/htdocs/lib/plugins/$$i . ; \
done
+ $(TOUCH) $@
$(DOKUWIKI)-clean:
# Remove files created by build/install
diff --git a/omd/packages/dokuwiki/skel/etc/dokuwiki/local.php
b/omd/packages/dokuwiki/skel/etc/dokuwiki/local.php
index 6c94217..d103e13 100644
--- a/omd/packages/dokuwiki/skel/etc/dokuwiki/local.php
+++ b/omd/packages/dokuwiki/skel/etc/dokuwiki/local.php
@@ -12,5 +12,6 @@ $conf['multisite']['auth_secret'] =
'/omd/sites/###SITE###/etc/auth.secret';
$conf['multisite']['auth_serials'] =
'/omd/sites/###SITE###/etc/auth.serials';
$conf['multisite']['htpasswd'] =
'/omd/sites/###SITE###/etc/htpasswd';
$conf['tpl']['vector']['vector_navigation_location'] =
'sidebar';
+$conf['dmode'] = 0770;
?>
diff --git a/omd/packages/omd/omd.make b/omd/packages/omd/omd.make
index a0de0d2..9a0bf5f 100644
--- a/omd/packages/omd/omd.make
+++ b/omd/packages/omd/omd.make
@@ -9,12 +9,14 @@ else
endif
OMD_INSTALL := $(BUILD_HELPER_DIR)/$(OMD_DIR)-install
+OMD_SKEL := $(BUILD_HELPER_DIR)/$(OMD_DIR)-skel
.PHONY: $(OMD) $(OMD)-install $(OMD)-skel
$(OMD):
$(OMD)-install: $(OMD_INSTALL)
+$(OMD)-skel: $(OMD_SKEL)
$(OMD_INSTALL):
install -m 755 $(PACKAGE_DIR)/$(OMD)/omd.bin $(DESTDIR)$(OMD_ROOT)/bin/omd
@@ -37,10 +39,10 @@ $(OMD_INSTALL):
install -m 644 $(PACKAGE_DIR)/$(OMD)/bash_completion $(DESTDIR)$(OMD_ROOT)/lib/omd/
$(MKDIR) $(DESTDIR)$(OMD_ROOT)/lib/omd/scripts/post-create
install -m 755 $(PACKAGE_DIR)/$(OMD)/hooks/* $(DESTDIR)$(OMD_ROOT)/lib/omd/hooks/
-
$(TOUCH) $@
-$(OMD)-skel:
+$(OMD_SKEL): $(OMD_INSTALL)
$(MKDIR) $(SKEL)/etc/bash_completion.d
+ $(TOUCH) $@
$(OMD)-clean: