diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2020-05-07 20:58:50 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2020-05-07 20:58:50 -0300 |
| commit | 298d43a828b10a194196fb90f6f65944f14901a5 (patch) | |
| tree | fecbbc2f31994b44707b558221677c97d84baaf2 /manifests | |
| parent | 737b596d073acad8ddcd26ac8a1c7e4a0dafd4b3 (diff) | |
| download | puppet-websites-master.tar.gz puppet-websites-master.tar.bz2 | |
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/resources.pp | 14 | ||||
| -rw-r--r-- | manifests/setup.pp | 2 |
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': |