diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2020-05-07 20:55:07 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2020-05-07 20:55:07 -0300 |
| commit | 6244a54a5bec86e04e12ef693fbcd181e4d2b5ae (patch) | |
| tree | 4b2ff302e6a8bc4fd1a88d12e77f289ea04a58e6 | |
| parent | d772434b66e7b77d827ee8525584f6a924fa3ad4 (diff) | |
| download | puppet-apache-6244a54a5bec86e04e12ef693fbcd181e4d2b5ae.tar.gz puppet-apache-6244a54a5bec86e04e12ef693fbcd181e4d2b5ae.tar.bz2 | |
Hiera 5 migration
| -rw-r--r-- | manifests/site.pp | 4 | ||||
| -rw-r--r-- | manifests/site/config.pp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/manifests/site.pp b/manifests/site.pp index f445ffc..dc7cd95 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -37,7 +37,7 @@ define apache::site( $custom_log = false, $custom_directives = false, $allow_override = false, - $hosting_domain = hiera('apache::site::domain', $::domain), + $hosting_domain = lookup('apache::site::domain', undef, undef, $::domain), $certbot = false, ) { $vhost = $filename ? { @@ -55,7 +55,7 @@ define apache::site( default => $mpm_group, } - $hidden_enabled = hiera('apache::site::hidden', false) + $hidden_enabled = lookup('apache::site::hidden', undef, undef, false) if $hidden_service == true and $hidden_enabled == true { tor::daemon::hidden_service { "${name}": version => $hidden_service_version, diff --git a/manifests/site/config.pp b/manifests/site/config.pp index 4440e59..8f4c1d4 100644 --- a/manifests/site/config.pp +++ b/manifests/site/config.pp @@ -23,7 +23,7 @@ define apache::site::config( $custom_log = false, $custom_directives = false, $allow_override = false, - $hosting_domain = hiera('apache::site::domain', $::domain), + $hosting_domain = lookup('apache::site::domain', undef, undef, $::domain), $certbot = false, ) { case $source { |