From e31b70b74948522867b72de89bbe526a985e039b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20M=E4kinen?= Date: Fri, 8 Feb 2013 08:53:52 +0200 Subject: [PATCH] Fixed SELinux contexts from git data directories. --- git/manifests/init.pp | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/git/manifests/init.pp b/git/manifests/init.pp index fc16834..42009c1 100644 --- a/git/manifests/init.pp +++ b/git/manifests/init.pp @@ -33,10 +33,11 @@ class git::server { if $git_datadir { file { $git_datadir: - ensure => directory, - mode => "0755", - owner => "root", - group => "root", + ensure => directory, + mode => "0755", + owner => "root", + seltype => "git_system_content_t", + group => "root", } file { "/srv/git": ensure => link, @@ -49,20 +50,13 @@ class git::server { mode => "0755", owner => "root", group => "root", - seltype => "httpd_sys_content_t", } } - if "${selinux}" == "true" { - selinux::manage_fcontext { "/srv/git(/.*)?": - type => "httpd_sys_content_t", - before => File["/srv/git"], - } - if $git_datadir { - selinux::manage_fcontext { "${git_datadir}(/.*)?": - type => "httpd_sys_content_t", - before => File[$git_datadir], - } + if $git_datadir { + selinux::manage_fcontext { "${git_datadir}(/.*)?": + type => "git_system_content_t", + before => File[$git_datadir], } }