Move crontab exim virtualdomains into dsa-puppet-stuff

diff --git a/modules/exim/files/dsa-email-virtualdomains.cron b/modules/exim/files/dsa-email-virtualdomains.cron
deleted file mode 100644 (file)
index 44c62c5..0000000
--- a/modules/exim/files/dsa-email-virtualdomains.cron
+++ /dev/null
@@ -1,7 +0,0 @@
-##
-## 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 /etc/exim4/email-virtualdomains && git pull --quiet --ff-only

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 59852d0..2ef980b 100644 (file)
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -35,12 +35,14 @@ class exim::mx inherits exim {
        }
 
        if has_role('mailrelay') {
-               file { '/etc/cron.d/dsa-email-virtualdomains':
-                       source => 'puppet:///modules/exim/dsa-email-virtualdomains.cron',
-               }
-       } else {
-               file { '/etc/cron.d/dsa-email-virtualdomains':
-                       ensure => absent,
+               concat::fragment { 'dsa-puppet-stuff--email-virtualdomains':
+                       target => '/etc/cron.d/dsa-puppet-stuff',
+                       content  => @(EOF)
+                               @hourly  root if [ ! -d /etc/exim4/email-virtualdomains ]; then cd /etc/exim4 && git clone mail-git:email-virtualdomains ; fi && cd /etc/exim4/email-virtualdomains && git pull --quiet --ff-only
+                               | EOF
                }
        }
+       file { '/etc/cron.d/dsa-email-virtualdomains':
+               ensure => absent,
+       }
 }