[omd-commits] OMD Git: omd: centos: apache/php does not like relative paths and quotes

git version control git at mathias-kettner.de
Thu May 26 16:42:50 CEST 2011


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

Author:   Sven Nierlein <sven at nierlein.de>
Date:     Thu May 26 13:57:50 2011 +0200
Commiter: Sven Nierlein <sven at nierlein.de>
Date:     Thu May 26 14:37:17 2011 +0200

centos: apache/php does not like relative paths and quotes

---

 packages/apache-omd/Makefile                    |    4 ++--
 packages/apache-omd/skel/etc/apache/php-wrapper |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/apache-omd/Makefile b/packages/apache-omd/Makefile
index 99cb597..b8eafa3 100644
--- a/packages/apache-omd/Makefile
+++ b/packages/apache-omd/Makefile
@@ -29,7 +29,7 @@ ifeq ($(CENTOS_WORKAROUND), 1)
   APACHE_MODULES_INSTALL=modfcgid_install
   APACHE_FCGID_PATH=$(OMD_ROOT)/lib/apache/mod_fcgid.so
   # workaround for centos/rh which ignores "php-cgi -d settings"
-  REPLACE_PHP_FCGI_BIN=$(PHP_FCGI_BIN) -c etc/apache/php.ini
+  REPLACE_PHP_FCGI_BIN=$(PHP_FCGI_BIN) -c $(OMD_ROOT)/etc/apache/php.ini
 endif
 
 .PHONY: skel
@@ -43,7 +43,7 @@ install: $(APACHE_MODULES_INSTALL)
 skel:
 	if [ $(CENTOS_WORKAROUND) -eq 1 ]; then \
 		cp /etc/php.ini $(SKEL)/etc/apache/php.ini; \
-		echo -e "\n\n; OMD OMD OMD OMD OMD OMD\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; \
+		echo -e "\n\n; OMD OMD OMD OMD OMD OMD\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
 
 	# Replace macros
diff --git a/packages/apache-omd/skel/etc/apache/php-wrapper b/packages/apache-omd/skel/etc/apache/php-wrapper
index bcf0da0..bb0f875 100644
--- a/packages/apache-omd/skel/etc/apache/php-wrapper
+++ b/packages/apache-omd/skel/etc/apache/php-wrapper
@@ -7,7 +7,7 @@ export PHP_FCGI_CHILDREN=8
 
 # Replace with the path to your FastCGI-enabled PHP executable
 exec ###PHP_FCGI_BIN### \
-    -d session.save_path='###ROOT###/tmp/php/session' \
-    -d upload_tmp_dir='###ROOT###/tmp/php/upload' \
-    -d soap.wsdl_cache_dir='###ROOT###/tmp/php/wsdl-cache' \
+    -d session.save_path=###ROOT###/tmp/php/session \
+    -d upload_tmp_dir=###ROOT###/tmp/php/upload \
+    -d soap.wsdl_cache_dir=###ROOT###/tmp/php/wsdl-cache \
     -d safe_mode='Off'



More information about the omd-commits mailing list