Revert 'Do not inherit File owning permissions for apache module'

This reverts commit 8d62e08d61.

Closes-bug: #1556084
Change-Id: I20ed986f5b5ed190750ff3894dec97d62a0700cf

deployment/Puppetfile

@@ -59,7 +59,7 @@ mod 'ntp',
 # Pull in puppetlabs-apache
 mod 'apache',
     :git => 'https://github.com/fuel-infra/puppetlabs-apache.git',
-    :ref => '1.6.0'
+    :ref => '1.6.0-rc1'
 
 # Pull in puppetlabs-apt
 mod 'apt',

deployment/puppet/osnailyfacter/manifests/apache.pp

@@ -49,17 +49,16 @@ class osnailyfacter::apache (
 
   apache::listen { $listen_ports: }
 
-  # TODO (vvalyavskiy) Currently, it's not possible to specify owning parameters for File resource,
-  # cause it breaks apache logging process. Optimization can be returned as soon as pull request
-  # will be merged - https://github.com/puppetlabs/puppetlabs-apache/pull/1340
+  File {
+    ensure  => 'file',
+    owner   => 'root',
+    group   => 'root',
+  }
 
   # we need to override the logrotate file provided by apache to work around
   # wsgi issues on the restart caused by logrotate.
   # LP#1491576 and https://github.com/GrahamDumpleton/mod_wsgi/issues/81
   file { '/etc/logrotate.d/apache2':
-    ensure  => 'file',
-    owner   => 'root',
-    group   => 'root',
     mode    => '0644',
     content => template('osnailyfacter/apache2.logrotate.erb'),
     require => Package['httpd']
@@ -74,17 +73,12 @@ class osnailyfacter::apache (
   $apache2_logrotate_delay = $delay[0] * 60
 
   file { '/etc/logrotate.d/httpd-prerotate':
-    ensure  => 'directory',
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0755',
+    ensure => 'directory',
+    mode   => '0755',
   }
 
   file { '/etc/logrotate.d/httpd-prerotate/apache2':
-    ensure  => 'file',
-    owner   => 'root',
-    group   => 'root',
     mode    => '0755',
     content => template('osnailyfacter/apache2.prerotate.erb'),
   }
-}
+}