Merge "enable htmlify on main log vhost"

modules/openstack_project/templates/logs.vhost.erb

@@ -1,3 +1,4 @@
+# -*- apache -*-
 # ************************************
 # Managed by Puppet
 # ************************************
@@ -11,11 +12,12 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
 <%= " ServerAlias #{serveraliases}" %>
 <% end -%>
   DocumentRoot <%= docroot %>
-  <FilesMatch \.txt\.gz$>
-    ForceType text/plain
-    AddDefaultCharset UTF-8
-    AddEncoding x-gzip gz
-  </FilesMatch>
+
+  # 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
+
   <FilesMatch \.html\.gz$>
     ForceType text/html
     AddDefaultCharset UTF-8
@@ -55,6 +57,11 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
      ReadmeName /help/tempest-logs.html
   </Directory>
 
+  RewriteEngine On
+  # rewrite all txt.gz files to map to our internal htmlify wsgi app
+  RewriteRule ^/(.*\.txt\.gz)$ /htmlify/$1 [QSA,L,PT]
+  WSGIScriptAlias /htmlify /usr/local/bin/htmlify-screen-log.py
+
   ErrorLog /var/log/apache2/<%= name %>_error.log
   LogLevel warn
   CustomLog /var/log/apache2/<%= name %>_access.log combined