diff options
| author | varac <varacanero@zeromail.org> | 2013-10-31 19:02:26 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-10-31 19:02:26 +0100 |
| commit | d3028bab434ae1bd5e4cdfc285088dbc83cbfac2 (patch) | |
| tree | cf1f3d402a861e580da24cd73e2909f187cbd433 /puppet | |
| parent | fc6bbacbd42209d24de35e841e72b9f9ef1349ea (diff) | |
| parent | 12f13e38f0776f801907841b8fe4ab65f67ad060 (diff) | |
Merge branch 'develop' of ssh://code.leap.se/leap_platform into develop
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/modules/site_postfix/manifests/mx/checks.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/site_postfix/manifests/mx/tls.pp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/puppet/modules/site_postfix/manifests/mx/checks.pp b/puppet/modules/site_postfix/manifests/mx/checks.pp index 6b19891c..5d75a5e5 100644 --- a/puppet/modules/site_postfix/manifests/mx/checks.pp +++ b/puppet/modules/site_postfix/manifests/mx/checks.pp @@ -22,7 +22,7 @@ class site_postfix::mx::checks { } # Anonymize the user's home IP from the email headers (Feature #3866) - package { 'postfix-pcre': ensure => installed } + package { 'postfix-pcre': ensure => installed, require => Package['postfix'] } file { '/etc/postfix/checks/received_anon': source => 'puppet:///modules/site_postfix/checks/received_anon', diff --git a/puppet/modules/site_postfix/manifests/mx/tls.pp b/puppet/modules/site_postfix/manifests/mx/tls.pp index cff686e5..08978efd 100644 --- a/puppet/modules/site_postfix/manifests/mx/tls.pp +++ b/puppet/modules/site_postfix/manifests/mx/tls.pp @@ -34,7 +34,7 @@ class site_postfix::mx::tls { user => root, group => root, creates => '/etc/postfix/smtpd_tls_dh_param.pem', - require => Package['gnutls-bin'] + require => [ Package['gnutls-bin'], Package['postfix'] ] } # Make sure the dh params file has correct ownership and mode |