diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-13 07:53:10 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-13 07:53:10 +0000 |
| commit | 3ac22b097d9a9e829ec45963a7c3a40dd12b40a1 (patch) | |
| tree | ae26d54d061b8f61a1ee2513aa913e8a5e3a1277 /sca-cpp/trunk/modules/oauth/oauth-conf | |
| parent | 1b5f778e514d74d86eee83932b9d5948d7e6e316 (diff) | |
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
Diffstat (limited to 'sca-cpp/trunk/modules/oauth/oauth-conf')
| -rwxr-xr-x | sca-cpp/trunk/modules/oauth/oauth-conf | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/sca-cpp/trunk/modules/oauth/oauth-conf b/sca-cpp/trunk/modules/oauth/oauth-conf index 91ae1916c7..4ac231a55b 100755 --- a/sca-cpp/trunk/modules/oauth/oauth-conf +++ b/sca-cpp/trunk/modules/oauth/oauth-conf @@ -26,7 +26,7 @@ conf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-conf"` host=`echo $conf | awk '{ print $6 }'` # Configure HTTPD mod_tuscany_oauth module -cat >>$root/conf/httpd.conf <<EOF +cat >>$root/conf/auth.conf <<EOF # Generated by: oauth-conf $* # Load support for OAuth authentication LoadModule mod_tuscany_oauth1 $here/libmod_tuscany_oauth1.so @@ -35,22 +35,10 @@ LoadModule mod_tuscany_oauth2 $here/libmod_tuscany_oauth2.so # Enable OAuth authentication <Location /> AuthType Open +AuthName "$host" AuthOAuth On AuthOAuthLoginPage /login -</Location> - -# Enable unauthenticated access to public areas -<Location /login> -AuthOAuth Off -</Location> -<Location /logout> -AuthOAuth Off -</Location> -<Location /public> -AuthOAuth Off -</Location> -<Location /ui> -AuthOAuth Off +Require valid-user </Location> # Configure OAuth App keys @@ -65,14 +53,3 @@ cat >$root/cert/oauth-keys.conf <<EOF EOF -cat >>$root/conf/vhost-ssl.conf <<EOF -# Generated by: oauth-conf $* -# Require OAuth authentication -<Location /> -AuthType Open -AuthName "$host" -Require valid-user -</Location> - -EOF - |