summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Belanger <pabelanger@redhat.com>2016-07-20 21:10:49 +0000
committerPaul Belanger <pabelanger@redhat.com>2016-07-20 23:24:41 +0000
commitfba135de661d0ac970a09b9a5a25a0c6723f7c63 (patch)
treeb98dbb81056131cf3bad52689dbbcc3e6fed7320
parent10844f7c9e84d1640039e1c6d73930b9b599c304 (diff)
Revert "Fix selinux problems on vhost"
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
Notes
Notes (review): Code-Review+2: Joshua Hesketh <joshua.hesketh@rackspace.com> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 21 Jul 2016 02:28:31 +0000 Reviewed-on: https://review.openstack.org/345049 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
-rw-r--r--manifests/vhost.pp14
1 files changed, 0 insertions, 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(
72 httpd::mod { 'version': ensure => present } 72 httpd::mod { 'version': ensure => present }
73 } 73 }
74 74
75 # selinux may deny directory listing and access to subdirectories
76 # so update context to allow it
77 if $::osfamily == 'RedHat' {
78 if ! defined(Exec["update_context_${docroot}"]) {
79 exec { "update_context_${docroot}":
80 command => "chcon -R -t httpd_sys_content_t ${docroot}/",
81 unless => "ls -lZ ${docroot} | grep httpd_sys_content_t",
82 path => '/bin:/usr/bin:/usr/local/bin:/usr/sbin',
83 require => Package['httpd'],
84 notify => Service['httpd'],
85 }
86 }
87 }
88
89 file { "${priority}-${name}.conf": 75 file { "${priority}-${name}.conf":
90 path => "${httpd::params::vdir}/${priority}-${name}.conf", 76 path => "${httpd::params::vdir}/${priority}-${name}.conf",
91 content => template($template), 77 content => template($template),