aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-12-12 19:39:50 -0200
committerSilvio Rhatto <rhatto@riseup.net>2017-12-12 19:39:50 -0200
commitb41e194764581e4751a4cd257d1fa5a734428021 (patch)
treec160c93cf1b86e1a4d002e788ad1ec11304d3b40 /manifests
parent24d1bebfb0f1e12729334ed4cc3559971b0ee798 (diff)
downloadpuppet-nodo-b41e194764581e4751a4cd257d1fa5a734428021.tar.gz
puppet-nodo-b41e194764581e4751a4cd257d1fa5a734428021.tar.bz2
Require bsd-mailx for monkeysphere::email_server_keys
Diffstat (limited to 'manifests')
-rw-r--r--manifests/subsystem/mail.pp4
-rw-r--r--manifests/subsystem/monkeysphere.pp4
2 files changed, 7 insertions, 1 deletions
diff --git a/manifests/subsystem/mail.pp b/manifests/subsystem/mail.pp
index 0ada682..b0cbf21 100644
--- a/manifests/subsystem/mail.pp
+++ b/manifests/subsystem/mail.pp
@@ -2,6 +2,10 @@ class nodo::subsystem::mail {
# Email delivery configuration
$mail_delivery = hiera('nodo::subsystem::mail::delivery', 'exim')
+ package { 'bsd-mailx':
+ ensure => present,
+ }
+
case $mail_delivery {
'tunnel': {
$mail_hostname = hiera('nodo::subsystem::mail::hostname')
diff --git a/manifests/subsystem/monkeysphere.pp b/manifests/subsystem/monkeysphere.pp
index c09effe..0fb39cb 100644
--- a/manifests/subsystem/monkeysphere.pp
+++ b/manifests/subsystem/monkeysphere.pp
@@ -16,5 +16,7 @@ define nodo::subsystem::monkeysphere(
#monkeysphere::publish_server_keys { }
# Email the server key
- monkeysphere::email_server_keys { "$mail_recipient": }
+ monkeysphere::email_server_keys { "$mail_recipient":
+ require => Package['bsd-mailx'],
+ }
}