opendev
/
puppet-cgit
Code Issues Proposed changes

Stop including policycoreutils-python 

When moving to new selinux, it's already including
that package, so it causes puppet to raise a duplicate here.

Needed-By: I053d1437ef85828654a2a3bb9fedd6296525dabd
Change-Id: I8500da48191613d2fc7451bc829c27e9e618711e
This commit is contained in:
Yolanda Robla 2015-06-04 14:24:49 +02:00
parent d2e1605687
commit 85338af7b3
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/selinux.pp
View File

@ -27,17 +27,12 @@ class cgit::selinux {
value => on
}
package { 'policycoreutils-python':
ensure => present,
}
exec { 'cgit_allow_http_port':
# If we cannot add the rule modify the existing rule.
onlyif => "bash -c \'! semanage port -a -t http_port_t -p tcp ${::cgit::http_port}\'",
command => "semanage port -m -t http_port_t -p tcp ${::cgit::http_port}",
path => '/bin:/usr/sbin',
before => Service['httpd'],
require => Package['policycoreutils-python'],
subscribe => File['/etc/httpd/conf/httpd.conf'],
refreshonly => true,
}
@ -47,7 +42,6 @@ class cgit::selinux {
onlyif => "bash -c \'! semanage port -a -t http_port_t -p tcp ${::cgit::https_port}\'",
command => "semanage port -m -t http_port_t -p tcp ${::cgit::https_port}",
path => '/bin:/usr/sbin',
require => Package['policycoreutils-python'],
subscribe => File['/etc/httpd/conf.d/ssl.conf'],
refreshonly => true,
}