From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 25 Dec 2017 11:15:53 +0000 (+0100)
Subject: Move crontab buildd into dsa-puppet-stuff
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=667b3e40ebf43ae0c32feeaa96408f861db59699;p=mirror%2Fdsa-puppet.git

Move crontab buildd into dsa-puppet-stuff
---

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 5cf7fb27a..87c3eda8e 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -76,6 +76,10 @@ class buildd ($ensure=present) {
 			ensure => absent,
 		}
 		file { '/etc/cron.d/dsa-buildd':
+			ensure => absent,
+		}
+		concat::fragment { 'dsa-puppet-stuff--buildd':
+			target => '/etc/cron.d/dsa-puppet-stuff',
 			source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
 			require => Package['debian.org']
 		}
@@ -95,7 +99,13 @@ class buildd ($ensure=present) {
 			}
 		}
 		file { '/etc/cron.d/puppet-buildd-aptitude':
-			content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
+			ensure => absent
+		}
+		concat::fragment { 'dsa-puppet-stuff--buildd-aptitude-killer':
+			target => '/etc/cron.d/dsa-puppet-stuff',
+			content  => @(EOF)
+				"*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill",
+				| EOF
 		}
 
 		service { 'buildd':
@@ -103,9 +113,15 @@ class buildd ($ensure=present) {
 			ensure => 'stopped',
 		}
 
+		file { '/etc/cron.d/puppet-update-buildd-schroots':
+			ensure => absent
+		}
 		if $has_srv_buildd {
-			file { '/etc/cron.d/puppet-update-buildd-schroots':
-				content  => "13 22 * * 0,3 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots buildd\n",
+			concat::fragment { 'dsa-puppet-stuff--buildd-update-schroots':
+				target => '/etc/cron.d/dsa-puppet-stuff',
+				content  => @(EOF)
+					13 22 * * 0,3 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots buildd
+					| EOF
 			}
 		}