Hiera 5 migration

diff --git a/manifests/site.pp b/manifests/site.pp
index f445ffc482a26c7009f832e3cf8e588dea4a4ed4..dc7cd952f90a32b9b095a9fcffe0ffda160f933d 100644 (file)
--- 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 4440e59528015ec6315d1ba2cb088132a88ec544..8f4c1d45a4aa99f0d8070244efcaa45de4ed98e3 100644 (file)
--- 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 {