diff options
| author | Andreas <andreas@immerda.ch> | 2009-12-26 22:08:14 +0100 |
|---|---|---|
| committer | Andreas <andreas@immerda.ch> | 2009-12-26 22:08:14 +0100 |
| commit | 0ff978e88d136b45a39eda4c7114d5238ebb78ff (patch) | |
| tree | 892f4c9146c6c68defe73673845f374bafb710a2 | |
| parent | 2cad483fa8b6b216144ee633d40acb577b0b56fc (diff) | |
changed davdir->davdbdir, add to template
| -rw-r--r-- | manifests/defaultdavdbdir.pp (renamed from manifests/defaultdavdir.pp) | 2 | ||||
| -rw-r--r-- | manifests/vhost/davdbdir.pp (renamed from manifests/vhost/davdir.pp) | 4 | ||||
| -rw-r--r-- | manifests/vhost/template.pp | 8 | ||||
| -rw-r--r-- | manifests/vhost/webdav.pp | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/manifests/defaultdavdir.pp b/manifests/defaultdavdbdir.pp index 694d420..8b5e00f 100644 --- a/manifests/defaultdavdir.pp +++ b/manifests/defaultdavdbdir.pp @@ -1,6 +1,6 @@ # manifests/defaultphpdirs.pp -class apache::defaultdavdir { +class apache::defaultdavdbdir { file{'/var/www/dav_db_dir': ensure => directory, require => Package['apache'], diff --git a/manifests/vhost/davdir.pp b/manifests/vhost/davdbdir.pp index 341d632..a9528f7 100644 --- a/manifests/vhost/davdir.pp +++ b/manifests/vhost/davdbdir.pp @@ -1,4 +1,4 @@ -define apache::vhost::davdir( +define apache::vhost::davdbdir( $ensure = present, $dav_db_dir = 'absent', $documentroot_owner = apache, @@ -10,7 +10,7 @@ define apache::vhost::davdir( # php db dir case $dav_db_dir { 'absent': { - include apache::defaultdavdir + include apache::defaultdavdbdir $real_dav_db_dir = "/var/www/dav_db_dir/$name" } default: { $real_dav_db_dir = $dav_db_dir } diff --git a/manifests/vhost/template.pp b/manifests/vhost/template.pp index bda1f04..d42f65c 100644 --- a/manifests/vhost/template.pp +++ b/manifests/vhost/template.pp @@ -32,6 +32,7 @@ define apache::vhost::template( $php_safe_mode_exec_bin_dir = 'absent', $php_upload_tmp_dir = 'absent', $php_session_save_path = 'absent', + $dav_db_dir = 'absent', $cgi_binpath = 'absent', $do_includes = false, $options = 'absent', @@ -122,6 +123,13 @@ define apache::vhost::template( } default: { $real_php_session_save_path = $php_session_save_path } } + # dav db dir + case $dav_db_dir { + 'absent': { + $real_dav_db_dir = "/var/www/dav_db_dir/$name" + } + default: { $real_dav_db_dir = $dav_db_dir } + } apache::vhost::file{$name: ensure => $ensure, diff --git a/manifests/vhost/webdav.pp b/manifests/vhost/webdav.pp index 8996ab7..81a43eb 100644 --- a/manifests/vhost/webdav.pp +++ b/manifests/vhost/webdav.pp @@ -36,7 +36,7 @@ define apache::vhost::webdav( $ldap_user = 'any', $dav_db_dir = 'absent' ){ - ::apache::vhost::davdir{"${name}": + ::apache::vhost::davdbdir{"${name}": ensure => $ensure, dav_db_dir => $dav_db_dir, documentroot_owner => $documentroot_owner, |