From 09a1d7f58dd757a6d861cdfdfbecd56b5f622d62 Mon Sep 17 00:00:00 2001
From: =?utf8?q?H=C3=A9ctor=20Or=C3=B3n=20Mart=C3=ADnez?= <zumbi@debian.org>
Date: Mon, 27 Oct 2014 17:05:57 +0100
Subject: [PATCH] Revert porterbox fiddlings

---
 modules/motd/templates/motd.erb     |  4 ++--
 modules/porterbox/manifests/init.pp | 12 ++----------
 modules/roles/manifests/init.pp     |  8 +-------
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index a91a1637..cfed6dca 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -50,7 +50,7 @@ if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose'))
   if p.delete('buildd')
     entries += ", the Debian #{arch} build daemon"
   end
-  if p.delete('porterbox') or scope.lookupvar('site::nodeinfo').has_key?('porterbox')
+  if p.delete('porterbox') or classes.include?("porterbox")
     entries += ", the Debian #{arch} porterbox"
   end
 
@@ -129,7 +129,7 @@ if scope.lookupvar('::cluster').to_s != 'undefined'
 end
 
 
-if scope.lookupvar('site::nodeinfo').has_key?('porterbox')
+if classes.include?("porterbox")
   purp += "\n " + wrap("Disk space on porter boxes is often limited.  Please respect your fellow porters by cleaning up after yourself and deleting schroots and source/build trees in your ~ as soon as feasible.  DSA reserves the right to recover disk space as necessary.  See <URL:http://dsa.debian.org/doc/schroot/> for a brief tutorial on using schroot.")
 end
 
diff --git a/modules/porterbox/manifests/init.pp b/modules/porterbox/manifests/init.pp
index b2a8620e..80179857 100644
--- a/modules/porterbox/manifests/init.pp
+++ b/modules/porterbox/manifests/init.pp
@@ -1,35 +1,27 @@
-class porterbox ($ensure = present){
-	if $ensure in present {
-		include schroot
-	}
+class porterbox {
+	include schroot
 
 	file { '/usr/local/bin/dd-schroot-cmd':
 		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/dd-schroot-cmd',
-		ensure => $ensure,
 	}
 	file { '/usr/local/bin/schroot-list-sessions':
 		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/schroot-list-sessions',
-		ensure => $ensure,
 	}
 	file { '/usr/local/sbin/setup-dchroot':
 		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/setup-dchroot',
-		ensure => $ensure,
 	}
 	file { '/usr/local/sbin/setup-all-dchroots':
 		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/setup-all-dchroots',
-		ensure => $ensure,
 	}
 	file { '/etc/cron.d/puppet-update-dchroots':
 		content  => "0 15 * * 0 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin chronic setup-all-dchroots\n",
-		ensure => $ensure,
 	}
 	file { '/etc/cron.weekly/puppet-mail-big-homedirs':
 		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/mail-big-homedirs',
-		ensure => $ensure,
 	}
 }
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 5ec93d16..eed52fe8 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -30,13 +30,7 @@ class roles {
 
 	# XXX: turn this into a real role
 	if getfromhash($site::nodeinfo, 'porterbox') {
-		class {'porterbox':
-			ensure => present,
-		}
-	} else {
-		class {'porterbox':
-			ensure => absent,
-		}
+		include porterbox
 	}
 
 	if has_role('bugs_mirror') {
-- 
2.39.2