diff options
Diffstat (limited to 'manifests/role/nas.pp')
| -rw-r--r-- | manifests/role/nas.pp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/manifests/role/nas.pp b/manifests/role/nas.pp index 7eecbe3..a24ef77 100644 --- a/manifests/role/nas.pp +++ b/manifests/role/nas.pp @@ -31,14 +31,14 @@ class nodo::role::nas( # http://lists.freedesktop.org/archives/avahi/2006-July/000824.html # http://cups.org/documentation.php/doc-1.6/ref-cupsd-conf.html#BrowseLocalProtocols # http://www.dns-sd.org/ServiceTypes.html - $avahi = hiera('nodo::role::nas::avahi', false) + $avahi = lookup('nodo::role::nas::avahi', undef, undef, false) if $avahi == true { include avahi } # DLNA - $dlna = hiera('nodo::role::nas::dlna', false) + $dlna = lookup('nodo::role::nas::dlna', undef, undef, false) if $dlna == true { # See https://wiki.archlinux.org/index.php/MiniDLNA#Automatic_Media_DB_Update @@ -71,7 +71,7 @@ class nodo::role::nas( # http://git.puppet.immerda.ch/?p=module-nfsd.git;a=summary # http://wiki.debian.org/NFSServerSetup # http://www.tldp.org/HOWTO/NFS-HOWTO/ - $nfs = hiera('nodo::role::nas::nfs', false) + $nfs = lookup('nodo::role::nas::nfs', undef, undef, false) if $nfs == true { # Main class @@ -88,7 +88,7 @@ class nodo::role::nas( # https://forum.openwrt.org/viewtopic.php?id=12976 # http://download.pureftpd.org/pub/pure-ftpd/doc/FAQ # http://www.massimilianomarini.com/04/02/2012/how-follow-symbolic-links-pure-ftpd - $ftp = hiera('nodo::role::nas::ftp', false) + $ftp = lookup('nodo::role::nas::ftp', undef, undef, false) if $ftp == true { # Main class @@ -132,15 +132,15 @@ class nodo::role::nas( # http://www.linuxplanet.com/linuxplanet/tutorials/6600/2 # http://forums.fedoraforum.org/showthread.php?t=260519 # http://randombio.com/linuxsetup38.html - $samba = hiera('nodo::role::nas::samba', false) + $samba = lookup('nodo::role::nas::samba', undef, undef, false) if $samba == true { # Main class class { 'samba::server': - workgroup => hiera('nodo::samba::workgroup', 'WORKGROUP'), - server_string => hiera('nodo::samba::server_string', 'Samba Server'), - interfaces => hiera('nodo::samba::interfaces', 'lo eth0'), - security => hiera('nodo::samba::security', 'user'), + workgroup => lookup('nodo::samba::workgroup', undef, undef, 'WORKGROUP'), + server_string => lookup('nodo::samba::server_string', undef, undef, 'Samba Server'), + interfaces => lookup('nodo::samba::interfaces', undef, undef, 'lo eth0'), + security => lookup('nodo::samba::security', undef, undef, 'user'), preferred_master => 'yes', printing => 'cups', printcap_name => 'cups', @@ -153,7 +153,7 @@ class nodo::role::nas( # http://linux-igd.sourceforge.net/documentation.php samba::server::option { # Remote announce won't work since routers don't forward broadcast traffic - #'remote announce': value => hiera('nodo::samba::remote_announce', ''); + #'remote announce': value => lookup('nodo::samba::remote_announce', undef, undef, ''); 'wins support': value => 'yes'; 'domain master': value => 'yes'; } @@ -191,7 +191,7 @@ class nodo::role::nas( # https://github.com/camptocamp/puppet-lighttpd # https://github.com/example42/puppet-lighttpd # http://git.puppet.immerda.ch/?p=module-lighttpd.git;a=summary - $http = hiera('nodo::role::nas::http', false) + $http = lookup('nodo::role::nas::http', undef, undef, false) if $http == true { # Main class @@ -224,7 +224,7 @@ class nodo::role::nas( # # TFTP # - $tftp = hiera('nodo::role::nas::tftp', false) + $tftp = lookup('nodo::role::nas::tftp', undef, undef, false) if $tftp == true { # Main class @@ -239,7 +239,7 @@ class nodo::role::nas( # # Rsync # - $rsync = hiera('nodo::role::nas::rsync', false) + $rsync = lookup('nodo::role::nas::rsync', undef, undef, false) if $rsync == true { include rsync::server @@ -263,7 +263,7 @@ class nodo::role::nas( # # MPD # - $mpd = hiera('nodo::role::nas::mpd', false) + $mpd = lookup('nodo::role::nas::mpd', undef, undef, false) if $mpd == true { include mpd @@ -274,7 +274,7 @@ class nodo::role::nas( # # CherryMusic # - $cherrymusic = hiera('nodo::role::nas::cherrymusic', false) + $cherrymusic = lookup('nodo::role::nas::cherrymusic', undef, undef, false) if $cherrymusic == true { include cherrymusic @@ -283,7 +283,7 @@ class nodo::role::nas( # # Airsonic # - $airsonic = hiera('nodo::role::nas::airsonic', false) + $airsonic = lookup('nodo::role::nas::airsonic', undef, undef, false) if $airsonic == true { include airsonic @@ -295,7 +295,7 @@ class nodo::role::nas( # References # https://github.com/mosen/puppet-cups # https://github.com/camptocamp/puppet-cups - $cups = hiera('nodo::role::nas::cups', false) + $cups = lookup('nodo::role::nas::cups', undef, undef, false) if $cups == true { include firewall::printer @@ -305,7 +305,7 @@ class nodo::role::nas( # # Torrent # - $torrent = hiera('nodo::role::nas::torrent', false) + $torrent = lookup('nodo::role::nas::torrent', undef, undef, false) if $torrent == true { include pyroscope @@ -318,7 +318,7 @@ class nodo::role::nas( # http://packages.debian.org/stable/forked-daapd # http://packages.debian.org/squeeze/mt-daapd # https://github.com/stahnma/puppet-module-daap_server - #$daap = hiera('nodo::role::nas::daap', false) + #$daap = lookup('nodo::role::nas::daap', undef, undef, false) #if $daap == true { # # Main class, but package not available on wheezy |