summaryrefslogtreecommitdiff
path: root/manifests/mlmmj
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-09-25 18:06:46 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-09-25 18:06:46 -0300
commitec330752c1ad65f81ef35a5793c80587bab12c4f (patch)
treed3cbafc68cf5bfee5ae1d71d9279a08f097ca4c8 /manifests/mlmmj
parent59c338448ea7b5b2d6fb8a08637e48e7468a3985 (diff)
downloadpuppet-mail-ec330752c1ad65f81ef35a5793c80587bab12c4f.tar.gz
puppet-mail-ec330752c1ad65f81ef35a5793c80587bab12c4f.tar.bz2
Use hiera for mlmmj htpasswd
Diffstat (limited to 'manifests/mlmmj')
-rw-r--r--manifests/mlmmj/web.pp11
1 files 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', ''),
}
}