diff options
| author | mh <mh@immerda.ch> | 2009-05-17 20:02:21 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-05-17 20:02:21 +0200 |
| commit | 9fd6d1ff19c02433aa486e2a0296ac78abf2810b (patch) | |
| tree | 4c70dee3de562fea8460327c1fbeed33056a4084 | |
| parent | 2656c25895fade2552c2ae4e2f63d13c6027c248 (diff) | |
htpasswds go on all systems to the same place
| -rw-r--r-- | manifests/defines/vhost_files.pp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/manifests/defines/vhost_files.pp b/manifests/defines/vhost_files.pp index 54a4d2f..c71c5eb 100644 --- a/manifests/defines/vhost_files.pp +++ b/manifests/defines/vhost_files.pp @@ -156,18 +156,10 @@ define apache::vhost::file( case $htpasswd_file { 'absent','nodeploy': { info("don't deploy a htpasswd file for ${name") } default: { - case $htpasswd_path { - 'absent': { - $real_htpasswd_path = $operatingsystem ? { - centos => "$apache::centos::config_dir/htpasswds/$name", - gentoo => "$apache::gentoo::config_dir/htpasswds/$name", - debian => "$apache::debian::config_dir/htpasswds/$name", - ubuntu => "$apache::ubuntu::config_dir/htpasswds/$name", - openbsd => "$apache::openbsd::config_dir/htpasswds/$name", - default => "/etc/apache2/htpasswds/$name" - } - } - default: { $real_htpasswd_path = $htpasswd_path } + if $htpasswd_path == 'absent' { + $real_htpasswd_path = "/var/www/htpasswds/$name" + } else { + $real_htpasswd_path = $htpasswd_path } file{$real_htpasswd_path: ensure => $ensure, |