[omd-commits] OMD Git: omd: Centos 5.6: added distro files

git version control git at mathias-kettner.de
Tue Apr 12 17:32:24 CEST 2011


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

Author:   Sven Nierlein <sven at nierlein.de>
Date:     Tue Apr 12 14:52:35 2011 +0200
Commiter: Sven Nierlein <sven at nierlein.de>
Date:     Tue Apr 12 14:52:35 2011 +0200

Centos 5.6: added distro files

---

 distros/Makefile.CENTOS_5.6  |   65 ++++++++++++++++++++++++++++++++++++++++++
 packages/apache-omd/Makefile |    2 +-
 t/03-distro-makefiles.t      |    2 +-
 3 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/distros/Makefile.CENTOS_5.6 b/distros/Makefile.CENTOS_5.6
new file mode 100644
index 0000000..307017b
--- /dev/null
+++ b/distros/Makefile.CENTOS_5.6
@@ -0,0 +1,65 @@
+DISTRO_CODE       = rh56
+BUILD_PACKAGES    =
+BUILD_PACKAGES   += cairo-devel
+BUILD_PACKAGES   += expat-devel
+BUILD_PACKAGES   += gcc
+BUILD_PACKAGES   += gcc-c++
+BUILD_PACKAGES   += libevent-devel
+BUILD_PACKAGES   += libtool-ltdl-devel
+BUILD_PACKAGES   += gd-devel
+BUILD_PACKAGES   += httpd-devel
+BUILD_PACKAGES   += libmcrypt-devel
+BUILD_PACKAGES   += libxml2-devel
+BUILD_PACKAGES   += mysql-devel
+BUILD_PACKAGES   += ncurses-devel
+BUILD_PACKAGES   += net-snmp
+BUILD_PACKAGES   += net-snmp-utils
+BUILD_PACKAGES   += openssl-devel
+BUILD_PACKAGES   += pango-devel
+BUILD_PACKAGES   += patch
+BUILD_PACKAGES   += perl-Net-SNMP
+BUILD_PACKAGES   += python-devel
+BUILD_PACKAGES   += readline-devel
+BUILD_PACKAGES   += rpm-build
+BUILD_PACKAGES   += samba-client
+BUILD_PACKAGES   += uuid-devel
+BUILD_PACKAGES   += which
+OS_PACKAGES       =
+OS_PACKAGES      += curl
+OS_PACKAGES      += dialog
+OS_PACKAGES      += expat
+OS_PACKAGES      += graphviz
+OS_PACKAGES      += graphviz-gd
+OS_PACKAGES      += httpd
+OS_PACKAGES      += libevent
+OS_PACKAGES      += libmcrypt
+OS_PACKAGES      += libtool-ltdl
+OS_PACKAGES      += mod_fcgid
+OS_PACKAGES      += mod_python
+OS_PACKAGES      += mysql-server
+OS_PACKAGES      += pango
+OS_PACKAGES      += patch
+OS_PACKAGES      += php
+OS_PACKAGES      += php-mbstring
+OS_PACKAGES      += php-pdo
+OS_PACKAGES      += php-gd
+OS_PACKAGES      += readline
+OS_PACKAGES      += rsync
+OS_PACKAGES      += uuid
+USERADD_OPTIONS   = -M
+ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s
+PACKAGE_INSTALL   = yum -y makecache ; yum -y install
+ACTIVATE_INITSCRIPT = chkconfig --add %s && chkconfig %s on
+APACHE_CONF_DIR   = /etc/httpd/conf.d
+APACHE_INIT       = /etc/init.d/httpd
+APACHE_USER       = apache
+APACHE_GROUP      = apache
+APACHE_BIN        = /usr/sbin/httpd
+APACHE_CTL        = /usr/sbin/apachectl
+APACHE_MODULE_DIR = /usr/lib/httpd/modules
+APACHE_MODULE_DIR_64 = /usr/lib64/httpd/modules
+APACHE_PYTHON_MODULE = mod_python.so
+APACHE_FCGID_MODULE = mod_fcgid.so
+PHP_FCGI_BIN	  = /usr/bin/php-cgi
+APACHE_ENMOD      = true %s
+BECOME_ROOT       = su -c
diff --git a/packages/apache-omd/Makefile b/packages/apache-omd/Makefile
index 7b87d5c..74c655d 100644
--- a/packages/apache-omd/Makefile
+++ b/packages/apache-omd/Makefile
@@ -15,7 +15,7 @@ APACHE_MODULES_INSTALL=
 APACHE_FCGID_PATH=$(MODULE_DIR)/$(APACHE_FCGID_MODULE)
 CENTOS_WORKAROUND=0
 REPLACE_PHP_FCGI_BIN=$(PHP_FCGI_BIN)
-ifeq ($(shell ../../distro),CENTOS 5.5)
+ifeq ($(DISTRO_NAME),CENTOS)
   CENTOS_WORKAROUND=1
   APACHE_MODULES=modfcgid
   APACHE_MODULES_INSTALL=modfcgid_install
diff --git a/t/03-distro-makefiles.t b/t/03-distro-makefiles.t
index 137db1b..b0c5257 100644
--- a/t/03-distro-makefiles.t
+++ b/t/03-distro-makefiles.t
@@ -10,7 +10,7 @@ use FindBin;
 use lib "$FindBin::Bin/lib/lib/perl5";
 
 if(-d "distros") {
-    plan tests => 169;
+    plan tests => 190;
 }
 else {
     plan( skip_all => 'need distros directory to run, please run from the project root' );



More information about the omd-commits mailing list