diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2020-05-07 20:58:21 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2020-05-07 20:58:21 -0300 |
commit | d6d256a293da043076351c62146228ed5bd4dfbc (patch) | |
tree | 230ffbd0ce66f2756fd2ac8bf897a11cf4329fc4 /manifests/subsystem/nas | |
parent | 508668172faddb6765b6de5582a9bd6214b859fb (diff) | |
download | puppet-nodo-d6d256a293da043076351c62146228ed5bd4dfbc.tar.gz puppet-nodo-d6d256a293da043076351c62146228ed5bd4dfbc.tar.bz2 |
Hiera 5 migration
Diffstat (limited to 'manifests/subsystem/nas')
-rw-r--r-- | manifests/subsystem/nas/share.pp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/manifests/subsystem/nas/share.pp b/manifests/subsystem/nas/share.pp index 94f8194..b3e8edc 100644 --- a/manifests/subsystem/nas/share.pp +++ b/manifests/subsystem/nas/share.pp @@ -21,7 +21,7 @@ define nodo::subsystem::nas::share( # # DLNA share # - $dlna = hiera('nodo::role::nas::dlna', false) + $dlna = lookup('nodo::role::nas::dlna', undef, undef, false) if $dlna == true and $dlna_type != '' { minidlna::share { $folder: @@ -35,7 +35,7 @@ define nodo::subsystem::nas::share( # # Samba share # - $samba = hiera('nodo::role::nas::samba', false) + $samba = lookup('nodo::role::nas::samba', undef, undef, false) if $samba == true { samba::server::share { $name: @@ -74,7 +74,7 @@ define nodo::subsystem::nas::share( # # NFS export # - $nfs = hiera('nodo::role::nas::nfs', false) + $nfs = lookup('nodo::role::nas::nfs', undef, undef, false) if $nfs == true { nfs::export { $name: @@ -87,7 +87,7 @@ define nodo::subsystem::nas::share( # # HTTP and FTP symlinks to media assets # - $http = hiera('nodo::role::nas::http', false) + $http = lookup('nodo::role::nas::http', undef, undef, false) if $http == true { file { [ "/var/www/data/${name}", "/home/ftp/${name}" ]: @@ -99,7 +99,7 @@ define nodo::subsystem::nas::share( # # Avahi service # - $avahi = hiera('nodo::role::nas::avahi', false) + $avahi = lookup('nodo::role::nas::avahi', undef, undef, false) if $avahi == true and $nfs == true { file { "/etc/avahi/services/nfs-${name}.service": @@ -113,7 +113,7 @@ define nodo::subsystem::nas::share( } # Make sure basic media exist, no matter which disk is attached - $cache = hiera('nodo::subsystem::media::folders::base', '/var/cache/media') + $cache = lookup('nodo::subsystem::media::folders::base', undef, undef, '/var/cache/media') if $cache != '' and $manage_folder != false { file { [ "${cache}/${name}" ]: |