From fdc007bdda3f69bec34452a2f1f0acce015875db Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sun, 17 May 2009 20:55:11 +0200
Subject: fix second wrong htpasswd path

---
 manifests/defines/vhost_files.pp | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'manifests')

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': {
-- 
cgit v1.2.3