arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

support apache2.4 in ubuntu

Browse Source
This commit is contained in:
immarvin 2014-11-11 19:04:52 -08:00
parent 3eaaa3b6f3
commit 84712be32c
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xCATsn/debian/control
View File

@ -7,7 +7,7 @@ Standards-Version: 3.7.2
Package: xcatsn
Architecture: all
Depends: ${perl:Depends}, xcat-server, perl-xcat, xcat-client, libdbd-sqlite3-perl, libxml-parser-perl, tftpd-hpa, tftp-hpa, conserver-xcat, libnet-telnet-perl, dhcp3-server, apache2, expect, nfs-kernel-server, nmap, bind9, ipmitool-xcat (>=1.8.9), syslinux-xcat, xnba-undi, xcat-genesis-amd64, elilo-xcat
Depends: ${perl:Depends}, xcat-server, perl-xcat, xcat-client, libdbd-sqlite3-perl, libxml-parser-perl, tftpd-hpa, tftp-hpa, conserver-xcat, libnet-telnet-perl, dhcp3-server, apache2, expect, nfs-kernel-server, nmap, bind9, ipmitool-xcat (>=1.8.9), syslinux-xcat, xnba-undi, xcat-genesis-scripts, elilo-xcat
Recommends: yaboot-xcat
Description: Metapackage for a common, default xCAT service node setup
xCATsn is a service node management package intended for at-scale management, including hardware management and software management.

2
xCATsn/debian/install
View File

@ -2,3 +2,5 @@ LICENSE.html opt/xcat/share/doc/packages/xCAT
xCATSN etc
xcat.conf etc/apache2/conf.d
xcat.conf.apach24 etc/apache2/conf.d/
xcat.conf etc/apache2/conf-available/
xcat.conf.apach24 etc/apache2/conf-available/

30
xCATsn/debian/postinst
View File

@ -28,13 +28,29 @@ case "$1" in
rm /etc/xCATMN
fi
ver=$(cat /etc/issue |awk '{print $2}')
num=${ver%.*}
file="xcat.conf.apach24"
if [ $num -gt 12 ];then
mv /etc/apache2/conf.d/xcat.conf.apach24 /etc/apache2/conf-enabled/
fi
#ver=$(cat /etc/issue |awk '{print $2}')
#num=${ver%.*}
#file="xcat.conf.apach24"
#if [ $num -gt 12 ];then
# mv /etc/apache2/conf.d/xcat.conf.apach24 /etc/apache2/conf-enabled/
#fi
if [ -n "$(httpd -v 2>&1 |grep -e '^Server version\s*:.*\/2.4')" ]
then
rm -rf /etc/httpd/conf.d/xcat.conf
ln -s /etc/xcat/conf.orig/xcat.conf.apach24 /etc/httpd/conf.d/xcat.conf
fi
if [ -n "$(apachectl -v 2>&1 |grep -e '^Server version\s*:.*\/2.4')" ]
then
rm -rf /etc/apache2/conf-enabled/xcat.conf
ln -s /etc/apache2/conf-available/xcat.conf.apach24 /etc/apache2/conf-enabled/xcat.conf
fi
if [ -n "$(apache2ctl -v 2>&1 |grep -e '^Server version\s*:.*\/2.4')" ]
then
rm -rf /etc/apache2/conf-enabled/xcat.conf
ln -s /etc/apache2/conf-available/xcat.conf.apach24 /etc/apache2/conf-enabled/xcat.conf
fi
apachedaemon='apache2'