summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/http/httpd-conf
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2010-07-06 09:05:57 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2010-07-06 09:05:57 +0000
commit0389017140b0af23e061fdd66d7467da75f95e83 (patch)
treedc2d6840ee46733632bcc16d1e3fb71bd9d810bf /sca-cpp/trunk/modules/http/httpd-conf
parentf2f3364d648a8bc7edd761677ac937a64c3225ae (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/http/httpd-conf')
-rwxr-xr-xsca-cpp/trunk/modules/http/httpd-conf8
1 files changed, 4 insertions, 4 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