4 files changed, 7 insertions, 18 deletions
diff --git a/sca-cpp/trunk/modules/http/httpd-conf b/sca-cpp/trunk/modules/http/httpd-conf
index b281874d92..2ef922145f 100755
--- a/sca-cpp/trunk/modules/http/httpd-conf
+++ b/sca-cpp/trunk/modules/http/httpd-conf
@@ -38,7 +38,7 @@ cat >$root/conf/httpd.conf <<EOF
 # Apache HTTPD server configuration
 
 # Set server name
-ServerName $host:$pport
+ServerName http://$host:$pport
 UseCanonicalName On
 UseCanonicalPhysicalPort off
 PidFile $root/logs/httpd.pid
@@ -107,20 +107,20 @@ Satisfy Any
 
 # Allow access to document root
 <Directory "$htdocs">
-Options +SymLinksIfOwnerMatch
+Options FollowSymLinks
 Allow from all
 </Directory>
 
 # Allow access to service components
 <Location />
-Options +SymLinksIfOwnerMatch
+Options FollowSymLinks
 Allow from all
 </Location>
 
 # Setup HTTP virtual host
 Listen $port
 <VirtualHost _default_:$port>
-ServerName $host:$pport
+ServerName http://$host:$pport
 </VirtualHost>
 
 EOF
diff --git a/sca-cpp/trunk/modules/http/httpd-ssl-conf b/sca-cpp/trunk/modules/http/httpd-ssl-conf
index 16b2322809..df1d8042bc 100755
--- a/sca-cpp/trunk/modules/http/httpd-ssl-conf
+++ b/sca-cpp/trunk/modules/http/httpd-ssl-conf
@@ -54,7 +54,7 @@ SSLRandomSeed connect builtin
 # HTTPS virtual host
 Listen $sslport
 <VirtualHost _default_:$sslport>
-ServerName $host:$sslpport
+ServerName https://$host:$sslpport
 UseCanonicalName On
 UseCanonicalPhysicalPort off
 
diff --git a/sca-cpp/trunk/modules/openid/openid-conf b/sca-cpp/trunk/modules/openid/openid-conf
index 2d30502ea6..eeae4292b7 100755
--- a/sca-cpp/trunk/modules/openid/openid-conf
+++ b/sca-cpp/trunk/modules/openid/openid-conf
@@ -24,12 +24,6 @@ htdocs=`readlink -f $2`
 openid_prefix=`cat openid.prefix`
 
 servername=`cat $root/conf/httpd.conf | grep ServerName | tail -1 | awk '{ print $2 }'`
-ssl=`cat $root/conf/httpd.conf | grep "SSLEngine" | awk '{ print $2 }'`
-if [ "$ssl" = "on" ]; then
-    protocol="https"
-else
-    protocol="http"
-fi
 
 # Configure HTTPD mod_auth_openid module
 cat >>$root/conf/httpd.conf <<EOF
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