summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/openid/openid-conf
diff options
context:
space:
mode:
Diffstat (limited to 'sca-cpp/trunk/modules/openid/openid-conf')
-rwxr-xr-xsca-cpp/trunk/modules/openid/openid-conf31
1 files changed, 4 insertions, 27 deletions
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