From 5420622ea2acd60331fa11031acaf08a2b170ada Mon Sep 17 00:00:00 2001
From: daniceexi <daniceexi@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 12 Jan 2012 02:44:51 +0000
Subject: [PATCH] Change the configuration file of xcat-ws to fit both rh and
 sles

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11367 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/xCAT-wsapi/xcat-ws.conf         |  5 -----
 xCAT-server/xCAT-wsapi/xcat-ws.conf.apache2 | 11 +++++++++++
 xCAT-server/xCAT-wsapi/xcat-ws.conf.httpd   |  4 ++++
 3 files changed, 15 insertions(+), 5 deletions(-)
 delete mode 100644 xCAT-server/xCAT-wsapi/xcat-ws.conf
 create mode 100644 xCAT-server/xCAT-wsapi/xcat-ws.conf.apache2
 create mode 100644 xCAT-server/xCAT-wsapi/xcat-ws.conf.httpd

diff --git a/xCAT-server/xCAT-wsapi/xcat-ws.conf b/xCAT-server/xCAT-wsapi/xcat-ws.conf
deleted file mode 100644
index a88169538..000000000
--- a/xCAT-server/xCAT-wsapi/xcat-ws.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LoadModule ssl_module /etc/httpd/modules/mod_ssl.so
-RewriteEngine On
-RewriteCond %{SERVER_PORT} 80
-RewriteCond %{REQUEST_URI} xcatws
-RewriteRule ^(.*)$ https://${HOSTNAME}$1 [R,L]
diff --git a/xCAT-server/xCAT-wsapi/xcat-ws.conf.apache2 b/xCAT-server/xCAT-wsapi/xcat-ws.conf.apache2
new file mode 100644
index 000000000..8e7326c59
--- /dev/null
+++ b/xCAT-server/xCAT-wsapi/xcat-ws.conf.apache2
@@ -0,0 +1,11 @@
+LoadModule rewrite_module /usr/lib64/apache2-prefork/mod_rewrite.so
+RewriteEngine On
+RewriteCond %{SERVER_PORT} 80
+RewriteCond %{REQUEST_URI} xcatws
+RewriteRule ^(.*)$ https://%{SERVER_NAME}$1 [R,L]
+
+<Files xcatws.cgi>
+    Order allow,deny
+    Allow from all
+</Files>
+
diff --git a/xCAT-server/xCAT-wsapi/xcat-ws.conf.httpd b/xCAT-server/xCAT-wsapi/xcat-ws.conf.httpd
new file mode 100644
index 000000000..921735e12
--- /dev/null
+++ b/xCAT-server/xCAT-wsapi/xcat-ws.conf.httpd
@@ -0,0 +1,4 @@
+RewriteEngine On
+RewriteCond %{SERVER_PORT} 80
+RewriteCond %{REQUEST_URI} xcatws
+RewriteRule ^(.*)$ https://%{SERVER_NAME}$1 [R,L]