summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/http/httpd-conf
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2010-07-04 18:53:29 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2010-07-04 18:53:29 +0000
commitc5a55dc9a5d9a2faf10800f25e74df284207bc09 (patch)
tree793574fe1986856cce95d2ca5b79d3986fc69380 /sca-cpp/trunk/modules/http/httpd-conf
parentd3748ed90ef6ede6952f5da8fbf5c5564134db1d (diff)
HTTPD configuration changes to properly work behind a proxy or in a cluster.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@960383 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/http/httpd-conf')
-rwxr-xr-xsca-cpp/trunk/modules/http/httpd-conf12
1 files changed, 9 insertions, 3 deletions
diff --git a/sca-cpp/trunk/modules/http/httpd-conf b/sca-cpp/trunk/modules/http/httpd-conf
index 35c6c78254..b281874d92 100755
--- a/sca-cpp/trunk/modules/http/httpd-conf
+++ b/sca-cpp/trunk/modules/http/httpd-conf
@@ -21,7 +21,11 @@
here=`readlink -f $0`; here=`dirname $here`
root=`readlink -f $1`
host=$2
-port=$3
+port=`echo $3 | awk -F "/" '{ print $1 }'`
+pport=`echo $3 | awk -F "/" '{ print $2 }'`
+if [ "$pport" = "" ]; then
+ pport=$port
+fi
htdocs=`readlink -f $4`
user=`id -un`
group=`id -gn`
@@ -34,7 +38,9 @@ cat >$root/conf/httpd.conf <<EOF
# Apache HTTPD server configuration
# Set server name
-ServerName $host
+ServerName $host:$pport
+UseCanonicalName On
+UseCanonicalPhysicalPort off
PidFile $root/logs/httpd.pid
# Minimal set of modules
@@ -114,7 +120,7 @@ Allow from all
# Setup HTTP virtual host
Listen $port
<VirtualHost _default_:$port>
-
+ServerName $host:$pport
</VirtualHost>
EOF