turn porterbox into a real role

[mirror/dsa-puppet.git] / modules / motd / templates / motd.erb

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index cdf2db0..41aa808 100644 (file)
--- 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 classes.include?("porterbox")
+  if classes.include?("roles::porterbox")
     entries += ", the Debian #{arch} porterbox"
   end
 
@@ -127,7 +127,7 @@ if scope.lookupvar('::cluster')
 end
 
 
-if classes.include?("porterbox")
+if classes.include?("roles::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:https://dsa.debian.org/doc/schroot/> for a brief tutorial on using schroot.  There may be chroots for architectures other than #{arch} available, please list available chroots to check.")
 end