summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2009-05-17 20:55:11 +0200
committermh <mh@immerda.ch>2009-05-17 20:55:11 +0200
commitfdc007bdda3f69bec34452a2f1f0acce015875db (patch)
tree2e59d5c137d4928209a2c4afc21327c7cd3655c7 /manifests
parente8eeacba82bd317a4cf48e649e1a5d03962f2bda (diff)
fix second wrong htpasswd path
Diffstat (limited to 'manifests')
-rw-r--r--manifests/defines/vhost_files.pp15
1 files changed, 4 insertions, 11 deletions
diff --git a/manifests/defines/vhost_files.pp b/manifests/defines/vhost_files.pp
index c71c5eb..6ed4fb3 100644
--- a/manifests/defines/vhost_files.pp
+++ b/manifests/defines/vhost_files.pp
@@ -238,17 +238,10 @@ define apache::vhost::template(
'www' => "www.${servername}",
default => $domainalias
}
- case $htpasswd_path {
- 'absent': {
- $real_htpasswd_path = $operatingsystem ? {
- 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
}
case $run_mode {
'itk': {