diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-04-02 06:23:35 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-04-02 06:23:35 +0000 |
| commit | 54b61a4f65fb36be0bc3f190707aac2c4226a4a9 (patch) | |
| tree | 5558f85da71d2f0a530001412f339fdc51495315 /sca-cpp/trunk/modules/http/form-auth-conf | |
| parent | d28e692331d0fa5cc4a8aa010f4c715da07abf7e (diff) | |
Support multiple Auth modules in a single server or proxy config. Minor fixes to the OAuth2 module to comply with the spec.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1308244 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/http/form-auth-conf')
| -rwxr-xr-x | sca-cpp/trunk/modules/http/form-auth-conf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sca-cpp/trunk/modules/http/form-auth-conf b/sca-cpp/trunk/modules/http/form-auth-conf index 4ba3bec23a..2898d9b7ed 100755 --- a/sca-cpp/trunk/modules/http/form-auth-conf +++ b/sca-cpp/trunk/modules/http/form-auth-conf @@ -25,7 +25,11 @@ 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 }'` -pw=`cat $root/cert/ca.key | head -2 | tail -1` +if [ "$2" = "" ]; then + pw=`cat $root/cert/ca.key | head -2 | tail -1` +else + pw="$2" +fi sslconf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-ssl-conf"` if [ "$sslconf" = "" ]; then |