From 8fdc6a6dc4b2b23b923d8cbfba5190933155e95d Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 20 Feb 2012 07:20:15 +0000
Subject: Refactor auth configuration to allow HTTP and HTTPS virtual hosts to
 use different auth mechanisms, and refactor log configuration to make it
 easier to use.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1291133 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-cpp/trunk/modules/http/form-auth-conf | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'sca-cpp/trunk/modules/http/form-auth-conf')

diff --git a/sca-cpp/trunk/modules/http/form-auth-conf b/sca-cpp/trunk/modules/http/form-auth-conf
index defa1bf8b1..4ba3bec23a 100755
--- a/sca-cpp/trunk/modules/http/form-auth-conf
+++ b/sca-cpp/trunk/modules/http/form-auth-conf
@@ -27,15 +27,22 @@ host=`echo $conf | awk '{ print $6 }'`
 
 pw=`cat $root/cert/ca.key | head -2 | tail -1`
 
+sslconf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-ssl-conf"`
+if [ "$sslconf" = "" ]; then
+    sslsuffix=""
+else
+    sslsuffix="-ssl"
+fi
+
 # Disallow public access to server resources
-cat >$root/conf/noauth.conf <<EOF
+cat >$root/conf/noauth$sslsuffix.conf <<EOF
 # Generated by: form-auth-conf $*
 # Disallow public access to server resources
 
 EOF
 
 # Generate form authentication configuration
-cat >>$root/conf/auth.conf <<EOF
+cat >>$root/conf/locauth$sslsuffix.conf <<EOF
 # Generated by: form-auth-conf $*
 # Require clients to present a userid + password through form-based
 # authentication
-- 
cgit v1.2.3