From fba135de661d0ac970a09b9a5a25a0c6723f7c63 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Wed, 20 Jul 2016 21:10:49 +0000
Subject: [PATCH] Revert "Fix selinux problems on vhost"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We are reverting as this breaks our gitXX.o.o servers, which are centos-7. EG:

  (/Stage[main]/Cgit/Httpd::Vhost[git.openstack.org]/Exec[update_context_MEANINGLESS ARGUMENT]/returns) chcon: cannot access ‘MEANINGLESS’: No such file or directory

This reverts commit 10844f7c9e84d1640039e1c6d73930b9b599c304.

Change-Id: I06435e6203bd8770bc6a817d3f0b33a05d84bdf6
---
 manifests/vhost.pp | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index d06f801..86e4870 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -72,20 +72,6 @@ define httpd::vhost(
     httpd::mod { 'version': ensure => present }
   }
 
-  # selinux may deny directory listing and access to subdirectories
-  # so update context to allow it
-  if $::osfamily == 'RedHat' {
-    if ! defined(Exec["update_context_${docroot}"]) {
-      exec { "update_context_${docroot}":
-        command => "chcon -R -t httpd_sys_content_t ${docroot}/",
-        unless  => "ls -lZ ${docroot} | grep httpd_sys_content_t",
-        path    => '/bin:/usr/bin:/usr/local/bin:/usr/sbin',
-        require => Package['httpd'],
-        notify  => Service['httpd'],
-      }
-    }
-  }
-
   file { "${priority}-${name}.conf":
       path    => "${httpd::params::vdir}/${priority}-${name}.conf",
       content => template($template),