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

fix the way to generate the xcat-ws conf files for both rh and sles

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11368 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi 2012-01-12 03:01:59 +00:00
parent 5420622ea2
commit 210080908e
2 changed files with 14 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
xCAT-server/xCAT-server.spec
View File

@ -164,12 +164,18 @@ cp LICENSE.html $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT-server
chmod 644 $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT-server/*
#echo $RPM_BUILD_ROOT %{prefix}
# genereate the configuration files for web service (REST API)
mkdir -p $RPM_BUILD_ROOT/%{prefix}/ws
mkdir -p $RPM_BUILD_ROOT/etc/apache2/conf.d
mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d
cp xCAT-wsapi/* $RPM_BUILD_ROOT/%{prefix}/ws
echo "ScriptAlias /xcatws %{prefix}/ws/xcatws.cgi" > $RPM_BUILD_ROOT/wstemp.txt
cat $RPM_BUILD_ROOT/%{prefix}/ws/xcat-ws.conf >> $RPM_BUILD_ROOT/wstemp.txt
mv $RPM_BUILD_ROOT/wstemp.txt $RPM_BUILD_ROOT/%{prefix}/ws/xcat-ws.conf
echo "ScriptAlias /xcatws %{prefix}/ws/xcatws.cgi" > $RPM_BUILD_ROOT/etc/apache2/conf.d/xcat-ws.conf
cat $RPM_BUILD_ROOT/%{prefix}/ws/xcat-ws.conf.apache2 >> $RPM_BUILD_ROOT/etc/apache2/conf.d/xcat-ws.conf
echo "ScriptAlias /xcatws %{prefix}/ws/xcatws.cgi" > $RPM_BUILD_ROOT/etc/httpd/conf.d/xcat-ws.conf
cat $RPM_BUILD_ROOT/%{prefix}/ws/xcat-ws.conf.httpd >> $RPM_BUILD_ROOT/etc/httpd/conf.d/xcat-ws.conf
rm -f $RPM_BUILD_ROOT/%{prefix}/ws/xcat-ws.conf.apache2
rm -f $RPM_BUILD_ROOT/%{prefix}/ws/xcat-ws.conf.httpd
%clean
rm -rf $RPM_BUILD_ROOT
@ -229,24 +235,6 @@ if [ "$1" -gt "1" ]; then #only on upgrade for AIX...
fi
%endif
#Web Service
%ifos linux
if [ -e "/etc/redhat-release" ]; then
apachedaemon='httpd'
#apacheuser='apache'
else #SUSE
apachedaemon='apache2'
#apacheuser='wwwrun'
fi
/bin/rm -f /etc/$apachedaemon/conf.d/xcat-ws.conf
mkdir -p /etc/$apachedaemon/conf.d/
/bin/ln -s %{prefix}/ws/xcat-ws.conf /etc/$apachedaemon/conf.d/
# Restart Apache Web Server
#/etc/init.d/$apachedaemon reload
%endif
exit 0
@ -262,20 +250,9 @@ if [ $1 == 0 ]; then #This means only on -e
/sbin/chkconfig --del xcatd
fi
rm -f /usr/sbin/xcatd #remove the symbolic
rm -f /etc/httpd/conf.d/xcat-ws.conf
rm -f /etc/httpd/conf.d/xcat-ws.conf
fi
%endif
%ifos linux
if [ -e "/etc/redhat-release" ]; then
apachedaemon='httpd'
#apacheuser='apache'
else #SUSE
apachedaemon='apache2'
#apacheuser='wwwrun'
fi
/bin/rm -f /etc/$apachedaemon/conf.d/xcat-ws.conf
%endif

4
xCAT/xCAT.spec
View File

@ -24,7 +24,7 @@ Conflicts: xCATsn
Requires: xCAT-server xCAT-client perl-DBD-SQLite
%ifos linux
Requires: dhcp httpd nfs-utils expect nmap fping bind perl-XML-Parser vsftpd
Requires: dhcp httpd nfs-utils expect nmap fping bind perl-XML-Parser vsftpd perl(CGI)
%ifarch s390x
# No additional requires for zLinux right now
%else
@ -36,7 +36,7 @@ Requires: conserver-xcat yaboot-xcat perl-Net-Telnet
Requires: perl-IO-Stty
%endif
%ifarch ppc64 x86_64
Requires: openslp-xcat mod_ssl.so()(64bit)
Requires: openslp-xcat
%endif
%endif