[checkmk-commits] move centos skel workaround into apache skel target

Module: check_mk Branch: master Commit: b7102ef85cf24dbe90d89cd540aeac53720cef47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7102ef85cf24d… Author: Alex Zurhake &lt;az(a)mathias-kettner.de&gt; Date: Mon Nov 19 14:57:42 2018 +0100 move centos skel workaround into apache skel target Change-Id: I4b04e9213d6b80aec3d8a0d182b446167d5d4e89 --- omd/packages/apache-omd/apache-omd.make | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/omd/packages/apache-omd/apache-omd.make b/omd/packages/apache-omd/apache-omd.make index 1d2961f..20ce5e6 100644 --- a/omd/packages/apache-omd/apache-omd.make +++ b/omd/packages/apache-omd/apache-omd.make @@ -81,15 +81,17 @@ $(APACHE_INSTALL): $(LN) -sf $(HTPASSWD_BIN) $(DESTDIR)$(OMD_ROOT)/bin/htpasswd $(TOUCH) $@ + $(MKDIR) $(BUILD_HELPER_DIR) + $(TOUCH) $@ + +$(APACHE_SKEL): $(APACHE_INSTALL) # This file is loaded by php-wrapper on RedHat/CentOS < 7 if [ $(CENTOS_WORKAROUND) -eq 1 ]; then \ + $(MKDIR) $(SKEL)/etc/apache/ cp /etc/php.ini $(SKEL)/etc/apache/php.ini; \ echo -e "\n\n; OMD OMD OMD OMD OMD OMD\n\nmemory_limit=64M\n\n[Session]\nsession.save_path=###ROOT###/tmp/php/session\nupload_tmp_dir=###ROOT###/tmp/php/upload\nsoap.wsdl_cache_dir=###ROOT###/tmp/php/wsdl-cache\n" >> $(SKEL)/etc/apache/php.ini; \ fi - $(MKDIR) $(BUILD_HELPER_DIR) - $(TOUCH) $@ - -$(APACHE_SKEL): $(APACHE_INSTALL) + # Create working directories $(MKDIR) $(SKEL)/var/log/apache $(MKDIR) $(SKEL)/var/www