hoster: sort alphabetically

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

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 41aa808..7e6446e 100644 (file)
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -47,15 +47,17 @@ if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose'))
   p = scope.lookupvar('site::nodeinfo')['ldap']['purpose'].clone()
   entries = ""
 
-  if p.delete('buildd')
+  if classes.include?("roles::buildd")
     entries += ", the Debian #{arch} build daemon"
+    p.delete('buildd')
   end
   if classes.include?("roles::porterbox")
     entries += ", the Debian #{arch} porterbox"
+    p.delete('porterbox')
   end
 
   if p.size() > 0
-    entries += (entries == "") ? ", " : ".  Also"
+    entries += (entries == "") ? ", " : ".  Also "
     entries +="used for the following services:\n"
     scope.lookupvar('site::nodeinfo')['ldap']['purpose'].sort.each do |l|
       l = markup(l)
@@ -131,7 +133,7 @@ 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
 
-if ninfo['not-bacula-client'] then
+if classes.include?('bacula::not_a_client') then
   purp += "\n " + wrap("Note that this host is _NOT_ being backed up.  If you care about your data, run your own backups.")
 end