From 076909377eaa3aa41936e3acb7e02a9b5b14d493 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Thu, 31 May 2012 11:38:45 +0200
Subject: fix various puppet language things

---
 manifests/htpasswd_user.pp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'manifests/htpasswd_user.pp')

diff --git a/manifests/htpasswd_user.pp b/manifests/htpasswd_user.pp
index 9fcea0a..c4c5453 100644
--- a/manifests/htpasswd_user.pp
+++ b/manifests/htpasswd_user.pp
@@ -16,10 +16,6 @@ define apache::htpasswd_user(
         'absent': { $real_site = $name }
         default: { $real_site = $site }
     }
-    case $path {
-        'absent': { $real_path = "/var/www/htpasswds/${real_site}" }
-        default: { $real_path = $path }
-    }
     if $password_iscrypted {
         $real_password = $password
     } else {
@@ -28,7 +24,10 @@ define apache::htpasswd_user(
 
     file_line{"htpasswd_for_${real_site}":
         ensure => $ensure,
-        path => $real_path,
+        path => $path ? {
+          'absent' => "/var/www/htpasswds/${real_site}",
+          default => $path
+        },
         line => "${username}:${real_password}",
     }
 }
-- 
cgit v1.2.3