ssh setup for weblog sync

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

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index bb8ad93..bdfa1f2 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -41,10 +41,6 @@ class exim {
                require => Package['exim4-daemon-heavy'],
                purge   => true,
        }
-       file { '/etc/exim4/Git':
-               ensure  => absent,
-               force   => true,
-       }
        file { '/etc/exim4/conf.d':
                ensure  => directory,
                purge   => true,
@@ -109,22 +105,22 @@ class exim {
                source => 'puppet:///modules/exim/common/logrotate-exim4-paniclog'
        }
        file { '/etc/exim4/ssl/thishost.crt':
-               source  => "puppet:///modules/ssl/auto-certs/${::fqdn}.crt",
+               content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/" + @fqdn + ".crt") %>'),
                group   => 'Debian-exim',
                mode    => '0640',
        }
        file { '/etc/exim4/ssl/thishost.key':
-               source  => "puppet:///modules/ssl/auto-certs/${::fqdn}.key",
+               content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/" + @fqdn + ".key") %>'),
                group   => 'Debian-exim',
                mode    => '0640',
        }
        file { '/etc/exim4/ssl/ca.crt':
-               source  => 'puppet:///modules/ssl/auto-certs/ca.crt',
+               content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/ca.crt") %>'),
                group   => 'Debian-exim',
                mode    => '0640',
        }
        file { '/etc/exim4/ssl/ca.crl':
-               source  => 'puppet:///modules/ssl/auto-certs/ca.crl',
+               content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/ca.crl") %>'),
                group   => 'Debian-exim',
                mode    => '0640',
        }
@@ -138,7 +134,7 @@ class exim {
        # Do we actually want this?  I'm only doing it because it's harmless
        # and makes the logs quiet.  There are better ways of making logs quiet,
        # though.
-       @ferm::rule { 'dsa-ident':
+       ferm::rule { 'dsa-ident':
                domain      => '(ip ip6)',
                description => 'Allow ident access',
                rule        => '&SERVICE(tcp, 113)'