Merge branch 'disable-http-trace-without-rewrite' into 'develop'

Disable HTTP TRACE with TraceEnable instead of RewriteRule

See merge request !58

src/plugins/apache-httpd/etc/httpd/conf.d/zlcgdm-dav.conf.in

@@ -192,9 +192,7 @@ DiskDMLite /etc/dmlite-disk.conf
 #
 <VirtualHost *:80>
   KeepAlive on
-  RewriteEngine on
-  RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-  RewriteRule .* - [F]
+  TraceEnable off
 </VirtualHost>
 
 #
@@ -207,9 +205,7 @@ Listen 443
 
 <VirtualHost *:443>
   KeepAlive on
-  RewriteEngine on
-  RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-  RewriteRule .* - [F]
+  TraceEnable off
 
   LoadModule ssl_module modules/mod_ssl.so
 

src/puppet/dmlite/templates/dav/zlcgdm-dav.conf

@@ -242,9 +242,7 @@ Listen <%= @dav_http_port %>
 <% end -%>
 <VirtualHost *:<%= @dav_http_port %>>
   KeepAlive on
-  RewriteEngine on
-  RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-  RewriteRule .* - [F]
+  TraceEnable off
 </VirtualHost>
 <% end -%>
 
@@ -259,9 +257,7 @@ Listen <%= @dav_https_port %>
 
 <VirtualHost *:<%= @dav_https_port %>>
   KeepAlive on
-  RewriteEngine on
-  RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-  RewriteRule .* - [F]
+  TraceEnable off
 
   LoadModule ssl_module modules/mod_ssl.so
 

src/puppet/dmlite/templates/dav/zlcgdm-dav_hdfs.conf

@@ -57,10 +57,7 @@ Listen <%= @dav_http_port %>
 
 <VirtualHost *:<%= @dav_http_port %>>
   KeepAlive on
-  RewriteEngine on
-  RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-  RewriteRule .* - [F]
-
+  TraceEnable off
 
   <% if @enable_disk -%>
   DiskDMLite <%= @dmlite_disk_conf %>
@@ -120,9 +117,7 @@ Listen <%= @dav_https_port %>
 
 <VirtualHost *:<%= @dav_https_port %>>
   KeepAlive on
-  RewriteEngine on
-  RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-  RewriteRule .* - [F]
+  TraceEnable off
 
   LoadModule ssl_module modules/mod_ssl.so