aboutsummaryrefslogtreecommitdiff
path: root/manifests/subsystem
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/subsystem')
-rw-r--r--manifests/subsystem/backup.pp14
-rw-r--r--manifests/subsystem/dhclient.pp6
-rw-r--r--manifests/subsystem/hosts.pp2
-rw-r--r--manifests/subsystem/mail.pp6
-rw-r--r--manifests/subsystem/media.pp2
-rw-r--r--manifests/subsystem/media/folders.pp8
-rw-r--r--manifests/subsystem/monkeysphere.pp4
-rw-r--r--manifests/subsystem/motd.pp4
-rw-r--r--manifests/subsystem/nas/share.pp12
-rw-r--r--manifests/subsystem/resolver.pp8
-rw-r--r--manifests/subsystem/scanner.pp2
-rw-r--r--manifests/subsystem/scanner/client.pp2
-rw-r--r--manifests/subsystem/screen/startup.pp8
-rw-r--r--manifests/subsystem/sshd.pp2
-rw-r--r--manifests/subsystem/sysctl/appliance.pp2
-rw-r--r--manifests/subsystem/sysctl/disable_ipv6.pp2
-rw-r--r--manifests/subsystem/sysctl/tcp_challenge_ack_limit.pp2
-rw-r--r--manifests/subsystem/udev/network.pp2
18 files changed, 44 insertions, 44 deletions
diff --git a/manifests/subsystem/backup.pp b/manifests/subsystem/backup.pp
index 8126249..bfdffaa 100644
--- a/manifests/subsystem/backup.pp
+++ b/manifests/subsystem/backup.pp
@@ -4,20 +4,20 @@ class nodo::subsystem::backup {
#
class { '::backup': }
- $local_backup = hiera('nodo::subsystem::backup::localhost', false)
+ $local_backup = lookup('nodo::subsystem::backup::localhost', undef, undef, false)
# Local encrypted backup
case $local_backup {
true,enabled,present: {
backup::duplicity { "localhost":
- encryptkey => hiera('nodo::subsystem::backup::encryptkey', false),
- password => hiera('nodo::subsystem::backup::password'),
+ encryptkey => lookup('nodo::subsystem::backup::encryptkey', undef, undef, false),
+ password => lookup('nodo::subsystem::backup::password'),
}
}
false,absent: {
backup::duplicity { "localhost":
- encryptkey => hiera('nodo::subsystem::backup::encryptkey', false),
- password => hiera('nodo::subsystem::backup::password', false),
+ encryptkey => lookup('nodo::subsystem::backup::encryptkey', undef, undef, false),
+ password => lookup('nodo::subsystem::backup::password', undef, undef, false),
ensure => absent,
}
}
@@ -25,10 +25,10 @@ class nodo::subsystem::backup {
}
# Setup rsync instances
- $rsync = hiera('backup::rsync', {})
+ $rsync = lookup('backup::rsync', undef, undef, {})
create_resources('backup::rsync', $rsync)
# Setup borg instances
- $borg = hiera('backup::borg', {})
+ $borg = lookup('backup::borg', undef, undef, {})
create_resources('backup::borg', $borg)
}
diff --git a/manifests/subsystem/dhclient.pp b/manifests/subsystem/dhclient.pp
index e67a6e8..e809f1a 100644
--- a/manifests/subsystem/dhclient.pp
+++ b/manifests/subsystem/dhclient.pp
@@ -1,7 +1,7 @@
class nodo::subsystem::dhclient(
- $ensure = hiera('nodo::subsystem::dhclient::ensure', 'present'),
- $supersede_domain_name = hiera('nodo::subsystem::dhclient::supersede_domain_name', $::domain),
- $supersede_domain_search = hiera('nodo::subsystem::dhclient::supersede_domain_search', $::domain)
+ $ensure = lookup('nodo::subsystem::dhclient::ensure', undef, undef, 'present'),
+ $supersede_domain_name = lookup('nodo::subsystem::dhclient::supersede_domain_name', undef, undef, $::domain),
+ $supersede_domain_search = lookup('nodo::subsystem::dhclient::supersede_domain_search', undef, undef, $::domain)
) {
package { 'isc-dhcp-client':
ensure => $ensure,
diff --git a/manifests/subsystem/hosts.pp b/manifests/subsystem/hosts.pp
index 341a827..54d112b 100644
--- a/manifests/subsystem/hosts.pp
+++ b/manifests/subsystem/hosts.pp
@@ -1,5 +1,5 @@
class nodo::subsystem::hosts(
- $custom = hiera('nodo::subsystem::hosts::custom', false)
+ $custom = lookup('nodo::subsystem::hosts::custom', undef, undef, false)
) {
# Sometimes might be useful to manage the whole
# hosts file, see http://projects.puppetlabs.com/issues/10704
diff --git a/manifests/subsystem/mail.pp b/manifests/subsystem/mail.pp
index d0773e9..2bfd75e 100644
--- a/manifests/subsystem/mail.pp
+++ b/manifests/subsystem/mail.pp
@@ -1,6 +1,6 @@
class nodo::subsystem::mail {
# Email delivery configuration
- $mail_delivery = hiera('nodo::subsystem::mail::delivery', 'exim')
+ $mail_delivery = lookup('nodo::subsystem::mail::delivery', undef, undef, 'exim')
# A handy SMTP wrapper
include nodo::subsystem::mail::msmtp
@@ -15,9 +15,9 @@ class nodo::subsystem::mail {
case $mail_delivery {
'tunnel': {
- $mail_hostname = hiera('nodo::subsystem::mail::hostname')
+ $mail_hostname = lookup('nodo::subsystem::mail::hostname')
tunnel::autossh::mail { "$mail_hostname":
- sshport => hiera('nodo::subsystem::mail::ssh_port'),
+ sshport => lookup('nodo::subsystem::mail::ssh_port'),
}
}
'postfix', 'disabled': { }
diff --git a/manifests/subsystem/media.pp b/manifests/subsystem/media.pp
index b67ddbd..1319e73 100644
--- a/manifests/subsystem/media.pp
+++ b/manifests/subsystem/media.pp
@@ -3,7 +3,7 @@ class nodo::subsystem::media {
class { [ 'nodo::subsystem::media::folders', 'nodo::subsystem::media::groups' ]: }
# Make sure basic media exist, no matter if there is an external disk attached
- $cache = hiera('nodo::media::folders', '')
+ $cache = lookup('nodo::media::folders', undef, undef, '')
if $cache != '' {
file { "${cache}":
diff --git a/manifests/subsystem/media/folders.pp b/manifests/subsystem/media/folders.pp
index a745a54..8afbca8 100644
--- a/manifests/subsystem/media/folders.pp
+++ b/manifests/subsystem/media/folders.pp
@@ -1,8 +1,8 @@
class nodo::subsystem::media::folders(
- $base = hiera('nodo::subsystem::media::folders::base', '/var/cache/media'),
- $cache = hiera('nodo::subsystem::media::folders::cache', directory),
- $owner = hiera('nodo::subsystem::media::folders::owner', false),
- $group = hiera('nodo::subsystem::media::folders::group', false)
+ $base = lookup('nodo::subsystem::media::folders::base', undef, undef, '/var/cache/media'),
+ $cache = lookup('nodo::subsystem::media::folders::cache', undef, undef, directory),
+ $owner = lookup('nodo::subsystem::media::folders::owner', undef, undef, false),
+ $group = lookup('nodo::subsystem::media::folders::group', undef, undef, false)
) {
# Removable media folders
file { [ "/media/usb", "/media/cdrom", "/media/tablet", "/media/phone" ]:
diff --git a/manifests/subsystem/monkeysphere.pp b/manifests/subsystem/monkeysphere.pp
index 13372ca..ab3bc18 100644
--- a/manifests/subsystem/monkeysphere.pp
+++ b/manifests/subsystem/monkeysphere.pp
@@ -1,6 +1,6 @@
define nodo::subsystem::monkeysphere(
- $port = hiera('nodo::monkeysphere_host::ssh_port', ''),
- $mail_recipient = hiera('mail::root_mail_recipient', 'nobody')
+ $port = lookup('nodo::monkeysphere_host::ssh_port', undef, undef, ''),
+ $mail_recipient = lookup('mail::root_mail_recipient', undef, undef, 'nobody')
) {
include monkeysphere
diff --git a/manifests/subsystem/motd.pp b/manifests/subsystem/motd.pp
index df671eb..1ce0038 100644
--- a/manifests/subsystem/motd.pp
+++ b/manifests/subsystem/motd.pp
@@ -1,6 +1,6 @@
class nodo::subsystem::motd(
- $message = hiera('nodo::subsystem::motd::message', ''),
- $network_name = hiera('nodo::subsystem::motd::network_name', 'Nodo')
+ $message = lookup('nodo::subsystem::motd::message', undef, undef, ''),
+ $network_name = lookup('nodo::subsystem::motd::network_name', undef, undef, 'Nodo')
) {
if $message != '' {
$append = "${message}\n"
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}" ]:
diff --git a/manifests/subsystem/resolver.pp b/manifests/subsystem/resolver.pp
index cca7609..00fe6c6 100644
--- a/manifests/subsystem/resolver.pp
+++ b/manifests/subsystem/resolver.pp
@@ -1,8 +1,8 @@
class nodo::subsystem::resolver(
- $manage = hiera('nodo::subsystem::resolver::manage', false),
- $nameservers = hiera('nodo::subsystem::resolver::nameservers', ''),
- $domain = hiera('nodo::subsystem::resolver::domain', $::domain),
- $search = hiera('nodo::subsystem::resolver::search', $::fqdn)
+ $manage = lookup('nodo::subsystem::resolver::manage', undef, undef, false),
+ $nameservers = lookup('nodo::subsystem::resolver::nameservers', undef, undef, ''),
+ $domain = lookup('nodo::subsystem::resolver::domain', undef, undef, $::domain),
+ $search = lookup('nodo::subsystem::resolver::search', undef, undef, $::fqdn)
) {
# DNS resolver
case $manage {
diff --git a/manifests/subsystem/scanner.pp b/manifests/subsystem/scanner.pp
index 89b0cc3..b1401cd 100644
--- a/manifests/subsystem/scanner.pp
+++ b/manifests/subsystem/scanner.pp
@@ -1,4 +1,4 @@
-class nodo::subsystem::scanner($access_list = hiera('nodo::subsystem::scanner::access_list', '')) {
+class nodo::subsystem::scanner($access_list = lookup('nodo::subsystem::scanner::access_list', undef, undef, '')) {
package { [ 'sane', 'sane-utils' ]:
ensure => present,
}
diff --git a/manifests/subsystem/scanner/client.pp b/manifests/subsystem/scanner/client.pp
index 873f8b9..c1eb92d 100644
--- a/manifests/subsystem/scanner/client.pp
+++ b/manifests/subsystem/scanner/client.pp
@@ -1,4 +1,4 @@
-class nodo::subsystem::scanner::client($server = hiera('nodo::subsystem::scanner::client::hostname', 'localhost')) {
+class nodo::subsystem::scanner::client($server = lookup('nodo::subsystem::scanner::client::hostname', undef, undef, 'localhost')) {
package { 'sane':
ensure => present,
}
diff --git a/manifests/subsystem/screen/startup.pp b/manifests/subsystem/screen/startup.pp
index 15f9b56..1c3a847 100644
--- a/manifests/subsystem/screen/startup.pp
+++ b/manifests/subsystem/screen/startup.pp
@@ -1,8 +1,8 @@
class nodo::subsystem::screen::startup(
- $windows = hiera('nodo::subsystem::screen::startup::windows', [ "${::hostname} 0 bash -c \"tail -F /var/log/*log /var/log/*/*log\"",
- "journal 1 journalctl -f",
- "top 2 top" ]),
- $select = hiera('nodo::subsystem::screen::startup::select', 1)
+ $windows = lookup('nodo::subsystem::screen::startup::windows', undef, undef, [ "${::hostname} 0 bash -c \"tail -F /var/log/*log /var/log/*/*log\"",
+ "journal 1 journalctl -f",
+ "top 2 top" ]),
+ $select = lookup('nodo::subsystem::screen::startup::select', undef, undef, 1)
) {
file { "/etc/screenrc.startup":
content => template('nodo/screen/screenrc.erb'),
diff --git a/manifests/subsystem/sshd.pp b/manifests/subsystem/sshd.pp
index c520c9e..dd0968b 100644
--- a/manifests/subsystem/sshd.pp
+++ b/manifests/subsystem/sshd.pp
@@ -1,5 +1,5 @@
class nodo::subsystem::sshd {
- $manage = hiera('nodo::subsystem::sshd::manage', true)
+ $manage = lookup('nodo::subsystem::sshd::manage', undef, undef, true)
if $manage == true {
include ::sshd
diff --git a/manifests/subsystem/sysctl/appliance.pp b/manifests/subsystem/sysctl/appliance.pp
index 23b1e96..2657542 100644
--- a/manifests/subsystem/sysctl/appliance.pp
+++ b/manifests/subsystem/sysctl/appliance.pp
@@ -1,4 +1,4 @@
-class nodo::subsystem::sysctl::appliance($kernel_panic = hiera('nodo::sysctl::appliance', '20')) {
+class nodo::subsystem::sysctl::appliance($kernel_panic = lookup('nodo::sysctl::appliance', undef, undef, '20')) {
file { "/etc/sysctl.d/kernel.panic.conf":
owner => "root",
group => "root",
diff --git a/manifests/subsystem/sysctl/disable_ipv6.pp b/manifests/subsystem/sysctl/disable_ipv6.pp
index 2404d8f..2c384c3 100644
--- a/manifests/subsystem/sysctl/disable_ipv6.pp
+++ b/manifests/subsystem/sysctl/disable_ipv6.pp
@@ -1,7 +1,7 @@
# Do not enable ipv6 by default
# See https://wiki.debian.org/DebianIPv6
class nodo::subsystem::sysctl::disable_ipv6(
- $ensure = hiera('nodo::sysctl::disable_ipv6', 'present'),
+ $ensure = lookup('nodo::sysctl::disable_ipv6', undef, undef, 'present'),
) {
file { "/etc/sysctl.d/disable_ipv6.conf":
owner => "root",
diff --git a/manifests/subsystem/sysctl/tcp_challenge_ack_limit.pp b/manifests/subsystem/sysctl/tcp_challenge_ack_limit.pp
index c1f6650..ca90e27 100644
--- a/manifests/subsystem/sysctl/tcp_challenge_ack_limit.pp
+++ b/manifests/subsystem/sysctl/tcp_challenge_ack_limit.pp
@@ -3,7 +3,7 @@
# http://coolnerd.co/2016/08/researchers-announce-linux-kernel-network-snooping-bug-naked-security/
# https://nakedsecurity.sophos.com/2016/08/12/researchers-announce-linux-kernel-network-snooping-bug/
class nodo::subsystem::sysctl::tcp_challenge_ack_limit(
- $ensure = hiera('nodo::sysctl::tcp_challenge_ack_limit', 'present'),
+ $ensure = lookup('nodo::sysctl::tcp_challenge_ack_limit', undef, undef, 'present'),
) {
file { "/etc/sysctl.d/tcp_challenge_ack_limit.conf":
owner => "root",
diff --git a/manifests/subsystem/udev/network.pp b/manifests/subsystem/udev/network.pp
index 2e42519..734c025 100644
--- a/manifests/subsystem/udev/network.pp
+++ b/manifests/subsystem/udev/network.pp
@@ -1,5 +1,5 @@
class nodo::subsystem::udev::network {
- $role = hiera('nodo::role', 'default')
+ $role = lookup('nodo::role', undef, undef, 'default')
file { '/etc/udev/rules.d/70-persistent-net.rules':
ensure => present,
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-01 16:48:56 +0000