diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-03-28 07:29:13 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-03-28 07:29:13 +0000 |
| commit | 67078ed604f76a6491629efe40cc7723f8cd4375 (patch) | |
| tree | f5340e9af4f846a5e8cddfc74317c373ab0d2411 /sca-cpp/trunk/modules/http/httpd-ssl-conf | |
| parent | 2faf4902f6203c0b9be093b7643b7bc2fb2f070c (diff) | |
Add a host parameter to the conf scripts to allow an external DNS host name to be used. Add HTTP basic auth to WSGI integration.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@928352 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/http/httpd-ssl-conf')
| -rwxr-xr-x | sca-cpp/trunk/modules/http/httpd-ssl-conf | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/sca-cpp/trunk/modules/http/httpd-ssl-conf b/sca-cpp/trunk/modules/http/httpd-ssl-conf index 6660ad9792..b064dc02dc 100755 --- a/sca-cpp/trunk/modules/http/httpd-ssl-conf +++ b/sca-cpp/trunk/modules/http/httpd-ssl-conf @@ -20,13 +20,9 @@ # Generate a minimal HTTPD SSL configuration here=`readlink -f $0`; here=`dirname $here` root=`readlink -f $1` -port=$2 -if [ "$port" != "80" ]; then - sslport=`echo "$port + 443" | bc` -else - sslport="443" -fi -host=`hostname -f` +host=$2 +sslport=$3 +htdocs=`readlink -f $4` # Extract organization name from our CA certificate org=`openssl x509 -noout -subject -nameopt multiline -in $root/conf/ca.crt | grep organizationName | awk -F "= " '{ print $2 }'` @@ -61,7 +57,12 @@ SSLCACertificateFile "$root/conf/ca.crt" SSLCertificateFile "$root/conf/server.crt" SSLCertificateKeyFile "$root/conf/server.key" BrowserMatch ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0 + +# Logging CustomLog "$root/logs/ssl_request_log" "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" +LogFormat "%h %l %u %t %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" sslcombined +CustomLog $root/logs/ssl_access_log sslcombined +LogLevel warn # Require clients to present either: # a certificate signed with our CA certificate of authority @@ -91,9 +92,7 @@ SCASSLCertificateKeyFile "$root/conf/server.key" EOF # Create test users for HTTP basic authentication -htpasswd -bc $root/conf/httpd.passwd admin admin 2>/dev/null -htpasswd -b $root/conf/httpd.passwd user password 2>/dev/null -htpasswd -b $root/conf/httpd.passwd test test 2>/dev/null +htpasswd -bc $root/conf/httpd.passwd test test 2>/dev/null htpasswd -b $root/conf/httpd.passwd foo foo 2>/dev/null htpasswd -b $root/conf/httpd.passwd bar bar 2>/dev/null |