Merge branch 'develop'

2 files changed, 40 insertions, 0 deletions

diff --git a/puppet/modules/apache b/puppet/modules/apache
deleted file mode 160000
-Subproject 117bed9a9263c21d253d86b667eb165948efdc2
diff --git a/puppet/modules/apache/manifests/vhost/davdbdir.pp b/puppet/modules/apache/manifests/vhost/davdbdir.pp
new file mode 100644
index 00000000..459167c9
--- /dev/null
+++ b/puppet/modules/apache/manifests/vhost/davdbdir.pp
@@ -0,0 +1,40 @@
+define apache::vhost::davdbdir(
+    $ensure = present,
+    $dav_db_dir = 'absent',
+    $documentroot_owner = apache,
+    $documentroot_group = 0,
+    $documentroot_mode = 0750,
+    $run_mode = 'normal',
+    $run_uid = 'absent'
+){
+    # php db dir
+    case $dav_db_dir {
+        'absent': {
+            include apache::defaultdavdbdir
+            $real_dav_db_dir = "/var/www/dav_db_dir/${name}"
+        }
+        default: { $real_dav_db_dir = $dav_db_dir }
+    }
+
+    case $ensure {
+        absent: {
+            file{$real_dav_db_dir:
+                ensure => absent,
+                purge => true,
+                force => true,
+                recurse => true,
+            }
+        }
+        default: {
+            file{$real_dav_db_dir:
+                ensure => directory,
+                owner => $run_mode ? {
+                    'itk' => $run_uid,
+                    default => $documentroot_owner
+                },
+                group => $documentroot_group, mode => $documentroot_mode;
+            }
+        }
+    }
+}
+