Merge "Deploy vhost template for nodepool.o.o logs"

modules/nodepool/files/nodepool-log.htaccess

@@ -1,3 +0,0 @@
-<IfModule mod_deflate.c>
-AddOutputFilterByType DEFLATE text/text
-</IfModule>

modules/nodepool/manifests/init.pp

@@ -252,7 +252,8 @@ class nodepool (
     apache::vhost { $vhost_name:
       port     => 80,
       priority => '50',
-      docroot  => $image_log_document_root,
+      docroot  => 'MEANINGLESS_ARGUMENT',
+      template => 'nodepool/nodepool-log.vhost.erb',
     }
 
     if $image_log_document_root != '/var/log/nodepool' {
@@ -267,17 +268,6 @@ class nodepool (
         ],
       }
     }
-
-    # htaccess to enable the large .log files to send with gzip
-    # compression
-    file { "${image_log_document_root}/.htaccess":
-      ensure  => present,
-      source  => 'puppet:///modules/nodepool/nodepool-log.htaccess',
-      mode    => '0644',
-      owner   => 'nodepool',
-      group   => 'nodepool',
-      require => File[$image_log_document_root],
-    }
   }
 
   if $sudo == true {

modules/nodepool/templates/nodepool-log.vhost.erb

@@ -0,0 +1,22 @@
+<VirtualHost <%= scope.lookupvar("nodepool::vhost_name") %>:80>
+
+  DocumentRoot <%= scope.lookupvar("nodepool:image_log_document_root") %>
+  <Directory>
+    Options <%= scope.lookupvar("apache::params::options") %>
+    AllowOverride None
+    Order allow,deny
+    allow from all
+  </Directory>
+
+  ErrorLog /var/log/<%= scope.lookupvar("apache::params::apache_name") %>/nodepool_error.log
+  LogLevel warn
+  CustomLog /var/log/<%= scope.lookupvar("apache::params::apache_name") %>/nodepool_access.log combined
+  ServerSignature Off
+
+  AddType text/plain .log
+
+  <IfModule mod_deflate.c>
+      SetOutputFilter DEFLATE
+  </IfModule>
+
+</VirtualHost>