[omd-commits] OMD Git: omd: redhat: apply centos patches on rh6 too

[git version control]

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

Author:   Sven Nierlein <sven at nierlein.de>
Date:     Mon May  2 23:41:59 2011 +0200
Commiter: Sven Nierlein <sven at nierlein.de>
Date:     Mon May  2 23:44:15 2011 +0200

redhat: apply centos patches on rh6 too

Signed-off-by: Sven Nierlein <sven at nierlein.de>

---

 packages/apache-omd/Makefile |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/apache-omd/Makefile b/packages/apache-omd/Makefile
index 74c655d..99cb597 100644
--- a/packages/apache-omd/Makefile
+++ b/packages/apache-omd/Makefile
@@ -15,13 +15,21 @@ APACHE_MODULES_INSTALL=
 APACHE_FCGID_PATH=$(MODULE_DIR)/$(APACHE_FCGID_MODULE)
 CENTOS_WORKAROUND=0
 REPLACE_PHP_FCGI_BIN=$(PHP_FCGI_BIN)
+
 ifeq ($(DISTRO_NAME),CENTOS)
+   CENTOS_WORKAROUND=1
+endif
+ifeq ($(DISTRO_NAME),REDHAT)
+  CENTOS_WORKAROUND=1
+endif
+
+ifeq ($(CENTOS_WORKAROUND), 1)
   CENTOS_WORKAROUND=1
   APACHE_MODULES=modfcgid
   APACHE_MODULES_INSTALL=modfcgid_install
   APACHE_FCGID_PATH=$(OMD_ROOT)/lib/apache/mod_fcgid.so
-  # workaround for centos which ignores "php-cgi -d settings"
-  REPLACE_PHP_FCGI_BIN=$(PHP_FCGI_BIN) -c /etc/php.ini -c etc/php.ini
+  # workaround for centos/rh which ignores "php-cgi -d settings"
+  REPLACE_PHP_FCGI_BIN=$(PHP_FCGI_BIN) -c etc/apache/php.ini
 endif
 
 .PHONY: skel
@@ -34,7 +42,8 @@ install: $(APACHE_MODULES_INSTALL)
 
 skel:
 	if [ $(CENTOS_WORKAROUND) -eq 1 ]; then \
-		echo -e "[Session]\nsession.save_path='###ROOT###/tmp/php/session'\nupload_tmp_dir='###ROOT###/tmp/php/upload'\nsoap.wsdl_cache_dir='###ROOT###/tmp/php/wsdl-cache'\nsafe_mode='Off'\n" > $(SKEL)/etc/apache/php.ini; \
+		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; \
 	fi
 
 	# Replace macros