diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-12-08 03:52:15 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-12-08 03:52:15 +0000 |
| commit | 47017915e45f786265f5763ebf711abfe308738c (patch) | |
| tree | e18b8e53d0dbb569024636fccf63bf7332241207 /sca-cpp | |
| parent | 08c61807724b591be6cae8985ebb823b7f16c037 (diff) | |
Move HTTPD Require configuration for openid resources to the openid configuration scripts.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1043294 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rwxr-xr-x | sca-cpp/trunk/modules/http/httpd-conf | 18 | ||||
| -rwxr-xr-x | sca-cpp/trunk/modules/openid/openid-conf | 10 | ||||
| -rwxr-xr-x | sca-cpp/trunk/modules/openid/openid-step2-conf | 10 |
3 files changed, 22 insertions, 16 deletions
diff --git a/sca-cpp/trunk/modules/http/httpd-conf b/sca-cpp/trunk/modules/http/httpd-conf index ed2b7bb06d..37fa2e4051 100755 --- a/sca-cpp/trunk/modules/http/httpd-conf +++ b/sca-cpp/trunk/modules/http/httpd-conf @@ -22,6 +22,8 @@ here=`readlink -f $0`; here=`dirname $here` mkdir -p $1 root=`readlink -f $1` +jsprefix=`readlink -f $here/../js` + host=$2 port=`$here/httpd-addr port $3` pport=`$here/httpd-addr pport $3` @@ -103,22 +105,6 @@ Require all granted AuthType None Require all granted </Location> -<Location /openid> -AuthType None -Require all granted -</Location> -<Location /ui> -AuthType None -Require all granted -</Location> -<Location /wiring> -AuthType None -Require all granted -</Location> -<Location /.well-known/host-meta> -AuthType None -Require all granted -</Location> <Location /favicon.ico> AuthType None Require all granted diff --git a/sca-cpp/trunk/modules/openid/openid-conf b/sca-cpp/trunk/modules/openid/openid-conf index 1a5739b5aa..797f8b0607 100755 --- a/sca-cpp/trunk/modules/openid/openid-conf +++ b/sca-cpp/trunk/modules/openid/openid-conf @@ -55,3 +55,13 @@ AuthOpenIDAXAdd LASTNAME http://axschema.org/namePerson/last EOF +cat >>$root/conf/httpd.conf <<EOF +# Generated by: openid-conf $* +# Allow access to /openid location +<Location /openid> +AuthType None +Require all granted +</Location> + +EOF + diff --git a/sca-cpp/trunk/modules/openid/openid-step2-conf b/sca-cpp/trunk/modules/openid/openid-step2-conf index d91becf7a4..559a62d20b 100755 --- a/sca-cpp/trunk/modules/openid/openid-step2-conf +++ b/sca-cpp/trunk/modules/openid/openid-step2-conf @@ -42,6 +42,16 @@ ForceType text/plain EOF +cat >>$root/conf/httpd.conf <<EOF +# Generated by: openid-conf $* +# Allow access to /.well-known/host-meta location +<Location /.well-known/host-meta> +AuthType None +Require all granted +</Location> + +EOF + # Generate OpenID XRDS document cat >$root/conf/openid.xrds <<EOF <?xml version="1.0" encoding="UTF-8"?> |