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/openid/openid-conf | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'sca-cpp/trunk/modules/openid/openid-conf')

diff --git a/sca-cpp/trunk/modules/openid/openid-conf b/sca-cpp/trunk/modules/openid/openid-conf
index c9e2d85586..f4f715ce99 100755
--- a/sca-cpp/trunk/modules/openid/openid-conf
+++ b/sca-cpp/trunk/modules/openid/openid-conf
@@ -26,14 +26,14 @@ conf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-conf"`
 host=`echo $conf | awk '{ print $6 }'`
 openid_prefix=`cat $here/openid.prefix`
 
-# Disallow public access to server resources
-cat >$root/conf/noauth.conf <<EOF
-# Generated by: openid-auth-conf $*
-# Disallow public access to server resources
+sslconf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-ssl-conf"`
+if [ "$sslconf" = "" ]; then
+    sslsuffix=""
+else
+    sslsuffix="-ssl"
+fi
 
-EOF
-
-# Configure OpenID authentication
+# Configure HTTPD mod_auth_openid module
 cat >>$root/conf/modules.conf <<EOF
 # Generated by: openid-conf $*
 # Load support for OpenID authentication
@@ -41,7 +41,15 @@ LoadModule authopenid_module  $openid_prefix/modules/mod_auth_openid.so
 
 EOF
 
-cat >>$root/conf/auth.conf <<EOF
+# Disallow public access to server resources
+cat >$root/conf/noauth$sslsuffix.conf <<EOF
+# Generated by: openid-auth-conf $*
+# Disallow public access to server resources
+
+EOF
+
+# Configure OpenID authentication
+cat >>$root/conf/locauth$sslsuffix.conf <<EOF
 # Generated by: openid-conf $*
 # Enable OpenID authentication
 <Location />
@@ -62,7 +70,7 @@ AuthOpenIDAXAdd LASTNAME http://axschema.org/namePerson/last
 
 EOF
 
-cat >>$root/conf/pubauth.conf <<EOF
+cat >>$root/conf/pubauth$sslsuffix.conf <<EOF
 # Generated by: openid-conf $*
 # Allow public access to /openid location
 <Location /openid>
-- 
cgit v1.2.3