9345873ac2
In I5e5d2da0ef3c385f836507e69a686821aba925a1 we applied new rewrite rules and mimetypes on logs-dev.o.o to try and make sure that rich html content (css/js/fonts) would work either when gzipped prior to initial log upload or when automatically gzipped after some time. This brings the change from logs-dev.o.o to logs.o.o. Change-Id: I20db0aa12eda8157d68a7b27dbbfe3ca729347c7
112 lines
3.8 KiB
Plaintext
112 lines
3.8 KiB
Plaintext
# -*- apache -*-
|
|
# ************************************
|
|
# Managed by Puppet
|
|
# ************************************
|
|
|
|
NameVirtualHost <%= @vhost_name %>:<%= @port %>
|
|
<VirtualHost <%= @vhost_name %>:<%= @port %>>
|
|
ServerName <%= @srvname %>
|
|
<% if @serveraliases.is_a? Array -%>
|
|
<% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
|
|
<% elsif @serveraliases != '' -%>
|
|
<%= " ServerAlias #{@serveraliases}" %>
|
|
<% end -%>
|
|
DocumentRoot <%= @docroot %>
|
|
|
|
AddType text/plain .log
|
|
AddType text/plain .sh
|
|
AddType text/plain .yaml
|
|
AddType text/plain .yml
|
|
|
|
# use Apache to compress the results afterwards, to save on the wire
|
|
# it's approx 18x savings of wire traffic to compress. We need to
|
|
# compress by content types that htmlify can produce
|
|
AddOutputFilterByType DEFLATE text/plain text/html application/x-font-ttf
|
|
|
|
<FilesMatch \.html\.gz$>
|
|
ForceType text/html
|
|
AddDefaultCharset UTF-8
|
|
AddEncoding x-gzip gz
|
|
</FilesMatch>
|
|
<FilesMatch \.css\.gz$>
|
|
ForceType text/css
|
|
AddDefaultCharset UTF-8
|
|
AddEncoding x-gzip gz
|
|
</FilesMatch>
|
|
<FilesMatch \.js\.gz$>
|
|
ForceType text/javascript
|
|
AddDefaultCharset UTF-8
|
|
AddEncoding x-gzip gz
|
|
</FilesMatch>
|
|
<FilesMatch \.ttf\.gz$>
|
|
ForceType application/x-font-ttf
|
|
AddEncoding x-gzip gz
|
|
</FilesMatch>
|
|
<FilesMatch \.css$>
|
|
# mod_mime_magic is sometimes passing css files as asm sources
|
|
# e.g css files generated by coverage reports
|
|
ForceType text/css
|
|
</FilesMatch>
|
|
<Directory <%= @docroot %>>
|
|
Options <%= @options %>
|
|
AllowOverride None
|
|
Order allow,deny
|
|
allow from all
|
|
Satisfy Any
|
|
</Directory>
|
|
<Directory /usr/local/lib/python2.7/dist-packages/os_loganalyze>
|
|
Allow from all
|
|
Satisfy Any
|
|
</Directory>
|
|
|
|
<Directory <%= @docroot %>/*/*/*/*/*-tempest-dsvm*/*>
|
|
ReadmeName /help/tempest-overview.html
|
|
</Directory>
|
|
<Directory <%= @docroot %>/periodic*/*/*-tempest-dsvm*/*>
|
|
ReadmeName /help/tempest-overview.html
|
|
</Directory>
|
|
<Directory <%= @docroot %>/*/*/*/*/*-tempest-dsvm*/*/logs/>
|
|
ReadmeName /help/tempest-logs.html
|
|
</Directory>
|
|
<Directory <%= @docroot %>/periodic*/*/*-tempest-dsvm*/*/logs/>
|
|
ReadmeName /help/tempest-logs.html
|
|
</Directory>
|
|
|
|
<Directory <%= @docroot %>/periodic*/*>
|
|
IndexOrderDefault Descending Date
|
|
</Directory>
|
|
|
|
RewriteEngine On
|
|
# If the specified file does not exist, look if there is a gzipped version
|
|
# If there is, serve that one instead
|
|
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} !-f
|
|
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME}.gz -f
|
|
RewriteRule ^/(.*)$ %{REQUEST_URI}.gz
|
|
|
|
# rewrite txt.gz & console.html[.gz] files to map to our internal htmlify
|
|
# wsgi app
|
|
# PT, Pass-through: to come back around and get picked up by the
|
|
# WSGIScriptAlias
|
|
# NS, No-subrequest: on coming back through, mod-autoindex may have added
|
|
# index.html which would match the !-f condition. We
|
|
# therefore ensure the rewrite doesn't trigger by
|
|
# disallowing subrequests.
|
|
RewriteRule ^/(.*\.txt\.gz)$ /htmlify/$1 [QSA,L,PT,NS]
|
|
RewriteRule ^/(.*console\.html(\.gz)?)$ /htmlify/$1 [QSA,L,PT,NS]
|
|
|
|
# Check if the request exists as a file, directory or symbolic link
|
|
# If not, write the request to htmlify to see if we can fetch from swift
|
|
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} !-f
|
|
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} !-d
|
|
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} !-l
|
|
RewriteCond %{REQUEST_FILENAME} !^/icon
|
|
RewriteRule ^/(.*)$ /htmlify/$1 [QSA,L,PT,NS]
|
|
|
|
WSGIScriptAlias /htmlify /usr/local/lib/python2.7/dist-packages/os_loganalyze/wsgi.py
|
|
|
|
ErrorLog /var/log/apache2/<%= @name %>_error.log
|
|
LogLevel warn
|
|
CustomLog /var/log/apache2/<%= @name %>_access.log combined
|
|
ServerSignature Off
|
|
</VirtualHost>
|