summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/resources.pp14
-rw-r--r--manifests/setup.pp2
2 files changed, 8 insertions, 8 deletions
diff --git a/manifests/resources.pp b/manifests/resources.pp
index 44ef67c..498d498 100644
--- a/manifests/resources.pp
+++ b/manifests/resources.pp
@@ -1,12 +1,12 @@
class websites::resources {
# Retrieve configured instances
- $sites = hiera('apache::sites', {})
- $modules = hiera('apache::modules', {})
- $configs = hiera('apache::configs', {})
- $databases = hiera('database::instances', {})
- $database_configs = hiera('database::configs', {})
- $ikiwikis = hiera('ikiwiki::instances', {})
- $domains = hiera('domain_check::instances', {})
+ $sites = lookup('apache::sites', undef, undef, {})
+ $modules = lookup('apache::modules', undef, undef, {})
+ $configs = lookup('apache::configs', undef, undef, {})
+ $databases = lookup('database::instances', undef, undef, {})
+ $database_configs = lookup('database::configs', undef, undef, {})
+ $ikiwikis = lookup('ikiwiki::instances', undef, undef, {})
+ $domains = lookup('domain_check::instances', undef, undef, {})
# Apply instances
create_resources('apache::site', $sites)
diff --git a/manifests/setup.pp b/manifests/setup.pp
index e9ac1d7..57866cf 100644
--- a/manifests/setup.pp
+++ b/manifests/setup.pp
@@ -1,6 +1,6 @@
class websites::setup {
# Third-party hosted nodes generally aren't behind an https proxy
- $hosting_type = hiera('nodo::vserver::hosting_type', 'direct')
+ $hosting_type = lookup('nodo::vserver::hosting_type', undef, undef, 'direct')
# Include apache
class { 'apache':