diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2020-05-07 20:57:13 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2020-05-07 20:57:13 -0300 |
commit | 85ddd696219533b6155164498f97f48753d9b648 (patch) | |
tree | 339d0debf1bb014b472fd033806c842d99a87c37 | |
parent | a74a3f1a0a1cf0f2aaa7c20ecc29fa1875467473 (diff) | |
download | puppet-git-85ddd696219533b6155164498f97f48753d9b648.tar.gz puppet-git-85ddd696219533b6155164498f97f48753d9b648.tar.bz2 |
Hiera 5 migration
-rw-r--r-- | manifests/daemon.pp | 6 | ||||
-rw-r--r-- | manifests/gitweb.pp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp index cdb8639..40ca0b8 100644 --- a/manifests/daemon.pp +++ b/manifests/daemon.pp @@ -1,7 +1,7 @@ class git::daemon ( - $implementation = hiera('git::daemon::implementation', 'gitolite'), - $inetd = hiera('git::daemon::inetd', true), - $groups = hiera('git::daemon::groups', [ 'puppet' ]), + $implementation = lookup('git::daemon::implementation', undef, undef, 'gitolite'), + $inetd = lookup('git::daemon::inetd', undef, undef, true), + $groups = lookup('git::daemon::groups', undef, undef, [ 'puppet' ]), ) { # directory for git user and repositories file { "/var/git": diff --git a/manifests/gitweb.pp b/manifests/gitweb.pp index d546349..1d670be 100644 --- a/manifests/gitweb.pp +++ b/manifests/gitweb.pp @@ -1,9 +1,9 @@ # This class handles a gitweb installation. class git::gitweb( - $protocol = hiera('git::web::protocol', 'git'), - $hosting_domain = hiera('apache::site::domain', $::domain), - $implementation = hiera('git::daemon::implementation', 'gitolite') + $protocol = lookup('git::web::protocol', undef, undef, 'git'), + $hosting_domain = lookup('apache::site::domain', undef, undef, $::domain), + $implementation = lookup('git::daemon::implementation', undef, undef, 'gitolite') ) { # the needed packages |