diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-07-06 09:05:57 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-07-06 09:05:57 +0000 |
| commit | 0389017140b0af23e061fdd66d7467da75f95e83 (patch) | |
| tree | dc2d6840ee46733632bcc16d1e3fb71bd9d810bf /sca-cpp/trunk/modules/server | |
| parent | f2f3364d648a8bc7edd761677ac937a64c3225ae (diff) | |
Minor cleanup of config scripts and samples.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@960846 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/server')
| -rwxr-xr-x | sca-cpp/trunk/modules/server/server-conf | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sca-cpp/trunk/modules/server/server-conf b/sca-cpp/trunk/modules/server/server-conf index 7cc8914f85..8ab6934d00 100755 --- a/sca-cpp/trunk/modules/server/server-conf +++ b/sca-cpp/trunk/modules/server/server-conf @@ -22,13 +22,11 @@ here=`readlink -f $0`; here=`dirname $here` root=`readlink -f $1` servername=`cat $root/conf/httpd.conf | grep ServerName | tail -1 | awk '{ print $2 }'` -host=`echo $servername | awk -F ":" '{ print $1 }'` +host=`echo $servername | awk -F ":" '{ printf "%s:%s", $1, $2 }'` port=`cat $root/conf/httpd.conf | grep Listen | tail -1 | awk '{ print $2 }'` ssl=`cat $root/conf/httpd.conf | grep "SSLEngine" | awk '{ print $2 }'` if [ "$ssl" = "on" ]; then - protocol="https" - cat >>$root/conf/httpd.conf <<EOF # Configure SCA SSL support SCASSLCACertificateFile "$root/conf/ca.crt" @@ -36,15 +34,12 @@ SCASSLCertificateFile "$root/conf/server.crt" SCASSLCertificateKeyFile "$root/conf/server.key" EOF - -else - protocol="http" fi cat >>$root/conf/httpd.conf <<EOF # Support for SCA component wiring LoadModule mod_tuscany_wiring $here/libmod_tuscany_wiring.so -SCAWiringServerName $protocol://$host:$port +SCAWiringServerName $host:$port Alias /js/tuscany-ref.js $here/htdocs/js/tuscany-ref.js |