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 10844f7c9e
.
Change-Id: I06435e6203bd8770bc6a817d3f0b33a05d84bdf6
This commit is contained in:
parent
10844f7c9e
commit
fba135de66
@ -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),
|
||||
|
Loading…
Reference in New Issue
Block a user