and restart service in question

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

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index e5b051b..95a24c1 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -24,7 +24,7 @@ class exim {
        concat::fragment { 'virtual_domain_template':
                target  => '/etc/exim4/virtualdomains',
                content => template('exim/virtualdomains.erb'),
-               order   => 05,
+               order   => '05',
        }
 
        service { 'exim4':
@@ -54,7 +54,7 @@ class exim {
        }
        file { '/etc/exim4/ssl':
                ensure  => directory,
-               group   => Debian-exim,
+               group   => 'Debian-exim',
                mode    => '0750',
                purge   => true,
        }
@@ -110,32 +110,33 @@ class exim {
        }
        file { '/etc/exim4/ssl/thishost.crt':
                source  => "puppet:///modules/exim/certs/${::fqdn}.crt",
-               group   => Debian-exim,
+               group   => 'Debian-exim',
                mode    => '0640',
        }
        file { '/etc/exim4/ssl/thishost.key':
                source  => "puppet:///modules/exim/certs/${::fqdn}.key",
-               group   => Debian-exim,
+               group   => 'Debian-exim',
                mode    => '0640',
        }
        file { '/etc/exim4/ssl/ca.crt':
                source  => 'puppet:///modules/exim/certs/ca.crt',
-               group   => Debian-exim,
+               group   => 'Debian-exim',
                mode    => '0640',
        }
        file { '/etc/exim4/ssl/ca.crl':
                source  => 'puppet:///modules/exim/certs/ca.crl',
-               group   => Debian-exim,
+               group   => 'Debian-exim',
                mode    => '0640',
        }
        file { '/var/log/exim4':
                ensure  => directory,
                mode    => '2750',
-               owner   => Debian-exim,
+               owner   => 'Debian-exim',
                group   => maillog,
        }
 
        case getfromhash($site::nodeinfo, 'mail_port') {
+                Numeric: { $mail_port = sprintf("%d", getfromhash($site::nodeinfo, 'mail_port')) }
                /^(\d+)$/: { $mail_port = $1 }
                default: { $mail_port = '25' }
        }