]> gitweb.fluxo.info Git - puppet-mail.git/commitdiff
Use hiera for mlmmj htpasswd
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 25 Sep 2015 21:06:46 +0000 (18:06 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 25 Sep 2015 21:06:46 +0000 (18:06 -0300)
manifests/mlmmj/web.pp

index 9d96ad241c20f36c23fb7899218be3a54e48acc2..473bb8c803cb51bc7eb3b6e5254a2ec8ce25ed29 100644 (file)
@@ -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', ''),
   }
 }