xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-09-28 04:58:19 +00:00
Code Issues Releases Wiki Activity

Fix apache config without confluent in SLES environnment

Browse Source
This commit is contained in:
Jarrod Johnson
2018-09-04 13:45:08 -04:00
parent 457c783cf9
commit a9bbd53147
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT/xCAT.spec
View File

@@ -14,6 +14,7 @@ Source1: xcat.conf
Source2: postscripts.tar.gz
Source3: templates.tar.gz
Source5: xCATMN
%define is_rh 0%{?el6:1}%{?el7:1}
%ifos linux
Source4: prescripts.tar.gz
@@ -22,6 +23,7 @@ Source8: etc.tar.gz
%endif
Source7: xcat.conf.apach24
Source9: xcat.conf.apach24.sles
Provides: xCAT = %{version}
Conflicts: xCATsn
@@ -173,6 +175,11 @@ mkdir -p postscripts/hostkeys
cd -
cp %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d/xcat.conf
cp %{SOURCE1} $RPM_BUILD_ROOT/etc/apache2/conf.d/xcat.conf
%if %is_rh
cp %{SOURCE7} $RPM_BUILD_ROOT/etc/%httpconfigdir/conf.orig/xcat.conf.apach24
%else
cp %{SOURCE9} $RPM_BUILD_ROOT/etc/%httpconfigdir/conf.orig/xcat.conf.apach24
%endif
cp %{SOURCE7} $RPM_BUILD_ROOT/etc/%httpconfigdir/conf.orig/xcat.conf.apach24
cp %{SOURCE1} $RPM_BUILD_ROOT/etc/%httpconfigdir/conf.orig/xcat.conf.apach22
cp %{SOURCE5} $RPM_BUILD_ROOT/etc/xCATMN
@@ -184,6 +191,7 @@ cp LICENSE.html $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT
%post
%ifos linux
#Apply the correct httpd/apache configuration file according to the httpd/apache version
%if %is_rh
if [ -n "$(httpd -v 2>&1 |grep -e '^Server version\s*:.*\/2.4')" ]
then
rm -rf /etc/httpd/conf.d/xcat.conf

7
xCATsn/xCATsn.spec
View File

@@ -16,6 +16,7 @@ Source2: license.tar.gz
Source3: xCATSN
Source5: templates.tar.gz
Source6: xcat.conf.apach24
Source7: xcat.conf.apach24.sles
Provides: xCATsn = %{version}
Requires: xCAT-server xCAT-client perl-DBD-SQLite xCAT-genesis-scripts-x86_64 xCAT-probe >= 2.12.2
@@ -74,6 +75,7 @@ Requires: syslinux
# PCM does not need or ship syslinux-xcat
Requires: syslinux-xcat
%endif
%define is_rh 0%{?el6:1}%{?el7:1}
%description
xCATsn is a service node management package intended for at-scale management,
@@ -104,7 +106,12 @@ cp %{SOURCE1} $RPM_BUILD_ROOT/etc/apache2/conf.d/xcat.conf
cp %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d/xcat.conf
cp %{SOURCE3} $RPM_BUILD_ROOT/etc/xCATSN
cp %{SOURCE1} $RPM_BUILD_ROOT/etc/xcat/conf.orig/xcat.conf.apach22
%if %is_rh
cp %{SOURCE6} $RPM_BUILD_ROOT/etc/xcat/conf.orig/xcat.conf.apach24
%else
cp %{SOURCE7} $RPM_BUILD_ROOT/etc/xcat/conf.orig/xcat.conf.apach24
%endif
cp -a etc/rsyslog.d/* $RPM_BUILD_ROOT/etc/xcat/rsyslog.conf/
cp -a etc/logrotate.d/* $RPM_BUILD_ROOT/etc/xcat/logrotate.conf/