diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-02-20 07:20:15 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-02-20 07:20:15 +0000 |
| commit | 8fdc6a6dc4b2b23b923d8cbfba5190933155e95d (patch) | |
| tree | 2d446c4c3f20ce56d2669ffc29d07c17a4e96ed2 /sca-cpp/trunk/modules/openid/openid-step2-conf | |
| parent | 08adcf2e783e4733e0fd646d353db3592c62140d (diff) | |
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
Diffstat (limited to 'sca-cpp/trunk/modules/openid/openid-step2-conf')
| -rwxr-xr-x | sca-cpp/trunk/modules/openid/openid-step2-conf | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sca-cpp/trunk/modules/openid/openid-step2-conf b/sca-cpp/trunk/modules/openid/openid-step2-conf index e9144b873a..f6ac968bfc 100755 --- a/sca-cpp/trunk/modules/openid/openid-step2-conf +++ b/sca-cpp/trunk/modules/openid/openid-step2-conf @@ -25,8 +25,15 @@ root=`echo "import os; print os.path.realpath('$1')" | python` conf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-conf"` host=`echo $conf | awk '{ print $6 }'` +sslconf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-ssl-conf"` +if [ "$sslconf" = "" ]; then + sslsuffix="" +else + sslsuffix="-ssl" +fi + # Configure HTTPD to serve OpenID XRDS and LRDD documents -cat >>$root/conf/auth.conf <<EOF +cat >>$root/conf/locauth$sslsuffix.conf <<EOF # Generated by: openid-step2-conf $* # Serve OpenID XRDS document Alias /openid $root/conf/openid.xrds @@ -42,7 +49,7 @@ ForceType text/plain EOF -cat >>$root/conf/pubauth.conf <<EOF +cat >>$root/conf/pubauth$sslsuffix.conf <<EOF # Generated by: openid-step2-conf $* # Allow access to /.well-known/host-meta location <Location /.well-known/host-meta> |