Merge "Serve IRC log files as MIME type text/plain."

modules/meetbot/manifests/site.pp

@@ -15,6 +15,7 @@ define meetbot::site(
     port     => 80,
     docroot  => "/srv/meetbot-${name}",
     priority => '50',
+    template => 'meetbot/vhost.erb',
   }
 
   file { $varlib:

modules/meetbot/templates/vhost.erb

@@ -0,0 +1,29 @@
+# ************************************
+# 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 \.log$>
+    ForceType text/plain
+    AddDefaultCharset UTF-8
+  </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>