From cfa1be910fb97b787ca541415eb4176cd6fc3655 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Tue, 18 Sep 2012 07:58:10 +0000
Subject: [PATCH] Serve gz html/txt files from logs.o.o.

Change-Id: I9c5405dcf19af6a48f39848fbb4f140e7e38dc48
Reviewed-on: https://review.openstack.org/13189
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
---
 modules/openstack_project/manifests/static.pp |  1 +
 .../templates/logs.vhost.erb                  | 34 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 modules/openstack_project/templates/logs.vhost.erb

diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp
index 027b9004f0..c71a0996f8 100644
--- a/modules/openstack_project/manifests/static.pp
+++ b/modules/openstack_project/manifests/static.pp
@@ -33,6 +33,7 @@ class openstack_project::static (
     priority => '50',
     docroot  => '/srv/static/logs',
     require  => File['/srv/static/logs'],
+    template => 'openstack_project/logs.vhost.erb',
   }
 
   file { '/srv/static':
diff --git a/modules/openstack_project/templates/logs.vhost.erb b/modules/openstack_project/templates/logs.vhost.erb
new file mode 100644
index 0000000000..4ee66e850f
--- /dev/null
+++ b/modules/openstack_project/templates/logs.vhost.erb
@@ -0,0 +1,34 @@
+# ************************************
+# 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 %>
+  <FilesMatch \.txt\.gz$>
+    ForceType text/plain
+    AddDefaultCharset UTF-8
+    AddEncoding x-gzip gz
+  </FilesMatch>
+  <FilesMatch \.html\.gz$>
+    ForceType text/html
+    AddDefaultCharset UTF-8
+    AddEncoding x-gzip gz
+  </FilesMatch>
+  <Directory <%= docroot %>>
+    Options <%= options %>
+    AllowOverride None
+    Order allow,deny
+    allow from all
+  </Directory>
+  ErrorLog /var/log/apache2/<%= name %>_error.log
+  LogLevel warn
+  CustomLog /var/log/apache2/<%= name %>_access.log combined
+  ServerSignature Off
+</VirtualHost>