diff options
Diffstat (limited to '')
-rwxr-xr-x | sca-cpp/trunk/modules/http/httpd-conf | 8 | ||||
-rwxr-xr-x | sca-cpp/trunk/modules/http/httpd-ssl-conf | 2 |
2 files changed, 5 insertions, 5 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 |