diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2020-05-07 20:57:53 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2020-05-07 20:57:53 -0300 |
| commit | 6f215690167ce4c23005feec574c91a8db1ae999 (patch) | |
| tree | 4e048d2f7ad30b279acda7d500352457ebfed261 /manifests/virtual/web | |
| parent | 826b93e4be39b91a44039debd36083096bd3f02d (diff) | |
| download | puppet-mail-6f215690167ce4c23005feec574c91a8db1ae999.tar.gz puppet-mail-6f215690167ce4c23005feec574c91a8db1ae999.tar.bz2 | |
Hiera 5 migration
Diffstat (limited to 'manifests/virtual/web')
| -rw-r--r-- | manifests/virtual/web/admin.pp | 2 | ||||
| -rw-r--r-- | manifests/virtual/web/client.pp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/manifests/virtual/web/admin.pp b/manifests/virtual/web/admin.pp index b3dfd86..76cd715 100644 --- a/manifests/virtual/web/admin.pp +++ b/manifests/virtual/web/admin.pp @@ -1,5 +1,5 @@ class mail::virtual::web::admin( - $postfixadmin_setup_hash = hiera('mail::virtual::web::postfixadmin_setup_hash', $mail::virtual::web::params::postfixadmin_setup_hash), + $postfixadmin_setup_hash = lookup('mail::virtual::web::postfixadmin_setup_hash', undef, undef, $mail::virtual::web::params::postfixadmin_setup_hash), ) { case $postfixadmin_setup_hash { '': { diff --git a/manifests/virtual/web/client.pp b/manifests/virtual/web/client.pp index 0a97606..016ceec 100644 --- a/manifests/virtual/web/client.pp +++ b/manifests/virtual/web/client.pp @@ -1,7 +1,7 @@ class mail::virtual::web::client( - $roundcube_des_key = hiera('mail::virtual::web::roundcube_des_key', $mail::virtual::web::params::roundcube_des_key), - $roundcube_logo = hiera('mail::virtual::web::roundcube_logo', $mail::virtual::web::params::roundcube_logo), - $roundcube_login_info = hiera('mail::virtual::web::roundcube_login_info', $mail::virtual::web::params::roundcube_login_info) + $roundcube_des_key = lookup('mail::virtual::web::roundcube_des_key', undef, undef, $mail::virtual::web::params::roundcube_des_key), + $roundcube_logo = lookup('mail::virtual::web::roundcube_logo', undef, undef, $mail::virtual::web::params::roundcube_logo), + $roundcube_login_info = lookup('mail::virtual::web::roundcube_login_info', undef, undef, $mail::virtual::web::params::roundcube_login_info) ) { include php include php::imap @@ -19,7 +19,7 @@ class mail::virtual::web::client( mpm => false, } - $web_db_pass = hiera('mail::virtual::web::database::password', '') + $web_db_pass = lookup('mail::virtual::web::database::password', undef, undef, '') database::instance { "mail": password => "${web_db_pass}", |