From ec330752c1ad65f81ef35a5793c80587bab12c4f Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 25 Sep 2015 18:06:46 -0300
Subject: Use hiera for mlmmj htpasswd

---
 manifests/mlmmj/web.pp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/manifests/mlmmj/web.pp b/manifests/mlmmj/web.pp
index 9d96ad2..473bb8c 100644
--- a/manifests/mlmmj/web.pp
+++ b/manifests/mlmmj/web.pp
@@ -21,11 +21,10 @@ class mail::mlmmj::web inherits websites::setup {
   }
 
   file { '/etc/mlmmj-php-web-admin/htpasswd':
-    ensure => present,
-    owner  => mlmmj,
-    group  => mlmmj,
-    mode   => 0640,
-    source => [ "puppet:///modules/site_mail/mlmmj/htpasswd",
-                "puppet:///modules/mail/mlmmj/htpasswd" ],
+    ensure  => present,
+    owner   => mlmmj,
+    group   => mlmmj,
+    mode    => 0640,
+    content => hiera('mail::mlmmj::web::htpasswd', ''),
   }
 }
-- 
cgit v1.2.3