From a9bbd531477af7409264a293b5c5dea5cd5866c7 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Tue, 4 Sep 2018 13:45:08 -0400
Subject: [PATCH] Fix apache config without confluent in SLES environnment

---
 xCAT/xCAT.spec     | 8 ++++++++
 xCATsn/xCATsn.spec | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec
index 60fe75186..dc902461f 100644
--- a/xCAT/xCAT.spec
+++ b/xCAT/xCAT.spec
@@ -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
diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec
index 6983f75fc..d6bcd68e0 100644
--- a/xCATsn/xCATsn.spec
+++ b/xCATsn/xCATsn.spec
@@ -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/