ordering hint

[dsa-puppet.git] / modules / exim / manifests / init.pp

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 4a213f9aa51c9aaccb96403cff136c2c213615d9..a9529ca1a78cb7abc564055026c84eb74c7bf407 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -10,9 +10,14 @@ class exim {
 
        package { 'exim4-daemon-heavy': ensure => installed }
 
+       Package['exim4-daemon-heavy']->Mailalias<| |>
+
        service { 'exim4':
                ensure  => running,
-               require => File['/etc/exim4/exim4.conf'],
+               require => [
+                       File['/etc/exim4/exim4.conf'],
+                       Package['exim4-daemon-heavy'],
+               ]
        }
 
        file { '/etc/exim4/':
@@ -43,6 +48,7 @@ class exim {
        }
        file { '/etc/exim4/exim4.conf':
                content => template('exim/eximconf.erb'),
+               require => File['/etc/exim4/ssl/thishost.crt'],
                notify  => Service['exim4'],
        }
        file { '/etc/mailname':
@@ -127,13 +133,13 @@ class exim {
 
        @ferm::rule { 'dsa-exim':
                description => 'Allow SMTP',
-               rule        => '&SERVICE_RANGE(tcp, $mail_port, $SMTP_SOURCES)'
+               rule        => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_SOURCES)"
        }
 
        @ferm::rule { 'dsa-exim-v6':
                description => 'Allow SMTP',
                domain      => 'ip6',
-               rule        => '&SERVICE_RANGE(tcp, $mail_port, $SMTP_V6_SOURCES)'
+               rule        => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_V6_SOURCES)"
        }
 
        # Do we actually want this?  I'm only doing it because it's harmless