From 0f81c0baea06f2ec09b3b4ce73556cd323a6b697 Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Sun, 6 Oct 2013 21:27:15 +0200 Subject: [PATCH] Check out email-virtualdomains using git, not through puppet itself --- modules/exim/files/dsa-email-virtualdomains.cron | 7 +++++++ modules/exim/manifests/init.pp | 10 +++------- 2 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 modules/exim/files/dsa-email-virtualdomains.cron diff --git a/modules/exim/files/dsa-email-virtualdomains.cron b/modules/exim/files/dsa-email-virtualdomains.cron new file mode 100644 index 00000000..1581ffe8 --- /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 9f362243..222b8051 100644 --- 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, -- 2.39.2