Check out email-virtualdomains using git, not through puppet itself

diff --git a/modules/exim/files/dsa-email-virtualdomains.cron b/modules/exim/files/dsa-email-virtualdomains.cron
new file mode 100644 (file)
index 0000000..1581ffe
--- /dev/null
+++ b/modules/exim/files/dsa-email-virtualdomains.cron
@@ -0,0 +1,7 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+SHELL=/bin/bash
+@hourly  root if [ ! -d /etc/exim4/email-virtualdomains ]; then cd /etc/exim4 && git clone mail-git:email-virtualdomains ; fi ; cd email-virtualdomains && git pull --quiet --ff-only

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 9f362243fc08e28f3f6b7bde38c1e2b66c3bd804..222b805112852868297ce9b14a13d137cdb00ed5 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -28,6 +28,9 @@ class exim {
                ]
        }
 
+       file { '/etc/cron.d/dsa-email-virtualdomains':
+               source => 'puppet:///modules/exim/dsa-email-virtualdomains.cron',
+       }
        file { '/etc/exim4/':
                ensure  => directory,
                mode    => '0755',
@@ -38,13 +41,6 @@ class exim {
                ensure  => absent,
                force   => true,
        }
-       # git checkouts through puppet.  yummy.
-       file { '/etc/exim4/email-virtualdomains':
-               recurse => true,
-               source => 'puppet:///modules/exim/email-virtualdomains',
-               purge  => true,
-               ignore => '.git',
-       }
        file { '/etc/exim4/conf.d':
                ensure  => directory,
                purge   => true,