Merge branch 'master' of labs.riseup.net:module_apache into riseup

1 files changed, 14 insertions, 6 deletions

diff --git a/manifests/defaultdavdbdir.pp b/manifests/defaultdavdbdir.pp
index 8b5e00f..c0e2a81 100644
--- a/manifests/defaultdavdbdir.pp
+++ b/manifests/defaultdavdbdir.pp
@@ -1,9 +1,17 @@
-# manifests/defaultphpdirs.pp
-
 class apache::defaultdavdbdir {
-    file{'/var/www/dav_db_dir':
-        ensure => directory,
-        require => Package['apache'],
-        owner => root, group => 0, mode => 0755;
+    file {
+        '/var/www/dav_db_dir' :
+            ensure => directory,
+            require => Package['apache'],
+            owner => root,
+            group => 0,
+            mode => 0755 ;
+    }
+    if $::selinux != 'false' {
+        selinux::fcontext {
+            ['/var/www/dav_db_dir/.+(/.*)?'] :
+                setype => 'httpd_var_lib_t',
+                before => File['/var/www/dav_db_dir'] ;
+        }
     }
 }