diff options
| -rw-r--r-- | manifests/mail.pp | 5 | ||||
| -rw-r--r-- | manifests/subsystems/monkeysphere.pp | 2 | ||||
| -rw-r--r-- | manifests/subsystems/tunnel.pp | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/manifests/mail.pp b/manifests/mail.pp index dd9f670..9a124c9 100644 --- a/manifests/mail.pp +++ b/manifests/mail.pp @@ -1,6 +1,3 @@ class nodo::mail { - # Class inclusion - $root_mail_recipient = hiera('nodo::root_mail_recipient', 'nobody') - include nodo::vserver - include mail::system + class { [ 'nodo::vserver', 'mail::system' ]: } } diff --git a/manifests/subsystems/monkeysphere.pp b/manifests/subsystems/monkeysphere.pp index 76530ca..b4b21e0 100644 --- a/manifests/subsystems/monkeysphere.pp +++ b/manifests/subsystems/monkeysphere.pp @@ -1,6 +1,6 @@ define monkeysphere_host( $port = hiera('nodo::monkeysphere_host::ssh_port', ''), - $mail_recipient = hiera('nodo::root_mail_recipient', 'nobody') + $mail_recipient = hiera('mail::root_mail_recipient', 'nobody') ) { include monkeysphere diff --git a/manifests/subsystems/tunnel.pp b/manifests/subsystems/tunnel.pp index e7e0fe4..47384df 100644 --- a/manifests/subsystems/tunnel.pp +++ b/manifests/subsystems/tunnel.pp @@ -21,7 +21,7 @@ class tunnel { # collect all resources from hosted tunnels Tunnel_server_realize <<| tag == "${::fqdn}" |>> - define setup($ensure = present, $user = $hostname, $host, $localport, $hostport, $sshport = '22', $keytype = 'rsa', $root_mail_recipient = hiera('nodo::root_mail_recipient', 'nobody')) { + define setup($ensure = present, $user = $hostname, $host, $localport, $hostport, $sshport = '22', $keytype = 'rsa', $root_mail_recipient = hiera('mail::root_mail_recipient', 'nobody')) { $dir = "/var/backups/remote/${user}.${::domain}" $tag = "backupninja-${::fqdn}" $ssh_dir = "${dir}/.ssh" |