diff options
Diffstat (limited to 'sca-cpp/trunk/modules/http/httpd-conf')
| -rwxr-xr-x | sca-cpp/trunk/modules/http/httpd-conf | 40 |
1 files changed, 30 insertions, 10 deletions
diff --git a/sca-cpp/trunk/modules/http/httpd-conf b/sca-cpp/trunk/modules/http/httpd-conf index e5e7f27287..f940073a91 100755 --- a/sca-cpp/trunk/modules/http/httpd-conf +++ b/sca-cpp/trunk/modules/http/httpd-conf @@ -35,6 +35,8 @@ else pportsuffix=":$pport" fi +dothost=`echo $host | grep "\."` + mkdir -p $4 htdocs=`echo "import os; print os.path.realpath('$4')" | python` @@ -85,10 +87,7 @@ LogFormat "[%{%a %b %d %H:%M:%S %Y}t] [access] %h %l %u \"%r\" %>s %b \"%{Refere Include conf/log.conf # Configure tracking -CookieTracking on -CookieName TuscanyVisitorId -CookieStyle Cookie -CookieExpires 31556926 +Include conf/tracking.conf # Configure Mime types and default charsets TypesConfig $here/conf/mime.types @@ -96,12 +95,12 @@ AddDefaultCharset utf-8 AddCharset utf-8 .html .js .css # Configure cache control -SetEnvIf Request_URI "^/app.html$" must-revalidate -Header onsuccess set Cache-Control "max-age=604800" env=!must-revalidate -Header set Cache-Control "must-revalidate, max-age=0" env=must-revalidate -Header set Expires "Tue, 01 Jan 1980 00:00:00 GMT" env=must-revalidate +<Directory /> +ExpiresActive On +ExpiresDefault M604800 +</Directory> -# Configuration auth modules +# Configure auth modules Include conf/auth.conf # Set default document root @@ -138,6 +137,7 @@ ServerName http://$host$pportsuffix <Location /> RewriteEngine on RewriteCond %{HTTP_HOST} !^$host [NC] +RewriteCond %{HTTP:X-Forwarded-Server} ^$ [NC] RewriteRule .* http://$host$pportsuffix%{REQUEST_URI} [R] </Location> @@ -152,6 +152,26 @@ Include conf/pubauth.conf EOF +# Generate tracking configuration +cat >$root/conf/tracking.conf <<EOF +# Generated by: httpd-conf $* +# Configure tracking +CookieTracking on +CookieName TuscanyVisitorId +CookieStyle Cookie +CookieExpires 31556926 + +EOF + +if [ "$dothost" != "" ]; then + cat >>$root/conf/tracking.conf <<EOF +# Generated by: httpd-conf $* +CookieDomain .$dothost + +EOF + +fi + # Configure logging cat >$root/conf/log.conf <<EOF # Generated by: httpd-conf $* @@ -206,6 +226,7 @@ LoadModule negotiation_module ${modules_prefix}/modules/mod_negotiation.so LoadModule dir_module ${modules_prefix}/modules/mod_dir.so LoadModule setenvif_module ${modules_prefix}/modules/mod_setenvif.so LoadModule env_module ${modules_prefix}/modules/mod_env.so +LoadModule expires_module ${modules_prefix}/modules/mod_expires.so <IfModule !log_config_module> LoadModule log_config_module ${modules_prefix}/modules/mod_log_config.so </IfModule> @@ -223,7 +244,6 @@ LoadModule ratelimit_module ${modules_prefix}/modules/mod_ratelimit.so LoadModule reqtimeout_module ${modules_prefix}/modules/mod_reqtimeout.so LoadModule mod_tuscany_ssltunnel $here/libmod_tuscany_ssltunnel$libsuffix -LoadModule mod_tuscany_openauth $here/libmod_tuscany_openauth$libsuffix EOF |