From 3ac22b097d9a9e829ec45963a7c3a40dd12b40a1 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 13 Nov 2010 07:53:10 +0000
Subject: Port to HTTPD 2.3.8. Add an auth module to make OpenID, OAuth 1/2 and
 HTTPD 2.3 Form auth modules play nice together.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1034693 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-cpp/trunk/modules/openid/openid-conf | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 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 839b58b554..1d208784de 100755
--- a/sca-cpp/trunk/modules/openid/openid-conf
+++ b/sca-cpp/trunk/modules/openid/openid-conf
@@ -26,8 +26,8 @@ conf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-conf"`
 host=`echo $conf | awk '{ print $6 }'`
 openid_prefix=`cat $here/openid.prefix`
 
-# Configure HTTPD mod_auth_openid module
-cat >>$root/conf/httpd.conf <<EOF
+# Configure OpenID authentication
+cat >>$root/conf/auth.conf <<EOF
 # Generated by: openid-conf $*
 # Load support for OpenID authentication
 LoadModule authopenid_module  $openid_prefix/modules/mod_auth_openid.so
@@ -35,6 +35,8 @@ LoadModule authopenid_module  $openid_prefix/modules/mod_auth_openid.so
 # Enable OpenID authentication
 <Location />
 AuthType Open
+AuthName "$host"
+Require valid-user
 AuthOpenIDEnabled On
 AuthOpenIDCookiePath /
 AuthOpenIDCookieName TuscanyOpenAuth
@@ -47,30 +49,5 @@ AuthOpenIDAXAdd FIRSTNAME http://axschema.org/namePerson/first
 AuthOpenIDAXAdd LASTNAME http://axschema.org/namePerson/last
 </Location>
 
-# Enable unauthenticated access to public areas
-<Location /login>
-AuthOpenIDEnabled Off
-</Location>
-<Location /logout>
-AuthOpenIDEnabled Off
-</Location>
-<Location /public>
-AuthOpenIDEnabled Off
-</Location>
-<Location /ui>
-AuthOpenIDEnabled Off
-</Location>
-
-EOF
-
-cat >>$root/conf/vhost-ssl.conf <<EOF
-# Generated by: openid-conf $*
-# Require OpenID authentication
-<Location />
-AuthType Open
-AuthName "$host"
-Require valid-user
-</Location>
-
 EOF
 
-- 
cgit v1.2.3