[omd-commits] OMD Git: omd: Added build support for CentOS 7.0

[git version control]

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Jul  8 10:22:42 2014 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Jul  8 10:22:42 2014 +0200

Added build support for CentOS 7.0

---

 Changelog                    |    1 +
 distro                       |   11 ++++++
 distros/Makefile.CENTOS_7.0  |   89 ++++++++++++++++++++++++++++++++++++++++++
 distros/Makefile.REDHAT_7.0  |    1 +
 packages/apache-omd/Makefile |    8 +++-
 5 files changed, 109 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index a98e038..e8e6820 100644
--- a/Changelog
+++ b/Changelog
@@ -25,6 +25,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - Icinga: Update to 1.11.4
           - Dokuwiki: Fixed integration with multisite cookie authentication
           - Added build support for Ubuntu 14.04
+          - Added build support for CentOS 7.0
           - New command lc for sending a core command via Livestatus, e.g.
             lc ENABLE_NOTIFICATIONS
 
diff --git a/distro b/distro
index 60d6587..ce12f7b 100755
--- a/distro
+++ b/distro
@@ -42,6 +42,9 @@ then
         if [ "${VERSION:0:24}" = "CentOS Linux release 6.0" ]; then
             echo "CENTOS${SEP}6.0"
             exit 0
+        elif [ "${VERSION:0:24}" = "CentOS Linux release 7.0" ]; then
+            echo "CENTOS${SEP}7.0"
+            exit 0
         fi
         REL=${VERSION#* }
         REL=${REL#* }
@@ -72,6 +75,10 @@ then
     then
         echo "REDHAT${SEP}6.5"
         exit 0
+    elif [ "${VERSION:0:43}" = "Red Hat Enterprise Linux Server release 7.0" ]
+    then
+        echo "REDHAT${SEP}7.0"
+        exit 0
     fi
 fi
 
@@ -89,6 +96,10 @@ then
     then
         echo "SLES$SEP${VERSION}SP2"
         exit 0
+    elif [ "$VERSION" = 10 -a "$SP" = 1 ] 
+    then
+        echo "SLES$SEP${VERSION}SP1"
+        exit 0
     elif [ "$VERSION" = 11 -a "$SP" = 3 ] 
     then
         echo "SLES$SEP${VERSION}SP3"
diff --git a/distros/Makefile.CENTOS_7.0 b/distros/Makefile.CENTOS_7.0
new file mode 100644
index 0000000..47af715
--- /dev/null
+++ b/distros/Makefile.CENTOS_7.0
@@ -0,0 +1,89 @@
+DISTRO_CODE       = rh70
+BUILD_PACKAGES    =
+BUILD_PACKAGES   += boost-devel
+BUILD_PACKAGES   += cairo-devel
+BUILD_PACKAGES   += curl-devel     # needed by perl modules / thruk
+BUILD_PACKAGES   += expat-devel
+BUILD_PACKAGES   += fping
+BUILD_PACKAGES   += bind-utils
+BUILD_PACKAGES   += gcc
+BUILD_PACKAGES   += gcc-c++
+BUILD_PACKAGES   += libevent-devel         # RHEL Server Optional
+BUILD_PACKAGES   += libtool-ltdl-devel     # RHEL Server Optional 
+BUILD_PACKAGES   += libtool-ltdl           # needed by libtool-ltdl-devel
+BUILD_PACKAGES   += gd-devel               # RHEL Server Optional
+BUILD_PACKAGES   += libXpm-devel           # needed by gd-devel
+BUILD_PACKAGES   += libjpeg-devel          # needed by gd-devel
+BUILD_PACKAGES   += httpd-devel
+BUILD_PACKAGES   += libmcrypt-devel        # MISSING
+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   += php
+BUILD_PACKAGES   += python-devel
+BUILD_PACKAGES   += readline-devel
+BUILD_PACKAGES   += compat-readline5
+BUILD_PACKAGES   += rpm-build
+BUILD_PACKAGES   += samba-client
+BUILD_PACKAGES   += libuuid-devel
+BUILD_PACKAGES   += which
+BUILD_PACKAGES   += perl-devel
+BUILD_PACKAGES   += perl-ExtUtils-Embed
+BUILD_PACKAGES   += perl-Time-HiRes
+BUILD_PACKAGES   += rsync
+BUILD_PACKAGES   += radiusclient-ng-devel
+OS_PACKAGES       =
+OS_PACKAGES      += time # needed for mk-job
+OS_PACKAGES      += traceroute # needed for Check_MK parent scan
+OS_PACKAGES      += boost-program-options
+OS_PACKAGES      += curl
+OS_PACKAGES      += dialog
+OS_PACKAGES      += expat
+OS_PACKAGES      += fping
+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      += mysql-server
+OS_PACKAGES      += net-snmp
+OS_PACKAGES      += net-snmp-utils
+OS_PACKAGES      += pango
+OS_PACKAGES      += patch
+OS_PACKAGES      += perl-Net-SNMP
+OS_PACKAGES      += php
+OS_PACKAGES      += php-mbstring
+OS_PACKAGES      += php-pdo
+OS_PACKAGES      += php-gd
+OS_PACKAGES      += readline
+OS_PACKAGES      += rsync
+OS_PACKAGES      += uuid
+OS_PACKAGES      += xinetd
+OS_PACKAGES      += xorg-x11-server-Xvfb
+OS_PACKAGES      += cronie
+OS_PACKAGES      += python-ldap # needed for ldap support in multisite
+OS_PACKAGES      += radiusclient-ng
+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_FCGID_MODULE = mod_fcgid.so
+PHP_FCGI_BIN      = /usr/bin/php-cgi
+APACHE_ENMOD      = true %s
+BECOME_ROOT       = su -c
+MOUNT_OPTIONS     =
diff --git a/distros/Makefile.REDHAT_7.0 b/distros/Makefile.REDHAT_7.0
new file mode 120000
index 0000000..b9282f2
--- /dev/null
+++ b/distros/Makefile.REDHAT_7.0
@@ -0,0 +1 @@
+Makefile.CENTOS_7.0
\ No newline at end of file
diff --git a/packages/apache-omd/Makefile b/packages/apache-omd/Makefile
index 0153267..e2bb407 100644
--- a/packages/apache-omd/Makefile
+++ b/packages/apache-omd/Makefile
@@ -21,6 +21,12 @@ APACHE_FCGID_PATH=$(MODULE_DIR)/$(APACHE_FCGID_MODULE)
 CENTOS_WORKAROUND=0
 REPLACE_PHP_FCGI_BIN=$(PHP_FCGI_BIN)
 
+# Try to find the apxs binary
+APXS=/usr/sbin/apxs
+ifneq ("$(wildcard $(APXS))","")
+    APXS=apxs
+endif
+
 ifeq ($(DISTRO_NAME),CENTOS)
    CENTOS_WORKAROUND=1
 endif
@@ -85,7 +91,7 @@ modfcgid:
 	tar zxf $(FCGI_FILE).tar.gz
 	patch -p0 < ./patches/0001-fcgid_proc_unix.c.patch
 	patch -p0 < ./patches/0002-fcgid_pm_unix.c.patch
-	cd $(FCGI_FILE) && APXS=/usr/sbin/apxs ./configure.apxs
+	cd $(FCGI_FILE) && APXS=$(APXS) ./configure.apxs
 	$(MAKE) -C $(FCGI_FILE)
 
 modfcgid_install: