X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=6b4f640ad4b9c8c780e6fc8632c182646d9b439e;hb=8227165a9fb86f64e11c6fb46bde3878fde08ee0;hp=a91a16378e05d1e423a4262c71da9c1eba8c2e4f;hpb=c54dc85e499b9c2ffe041ded769cf1da1453609d;p=mirror%2Fdsa-puppet.git
diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index a91a16378..6b4f640ad 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,8 +129,8 @@ if scope.lookupvar('::cluster').to_s != 'undefined'
end
-if scope.lookupvar('site::nodeinfo').has_key?('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 for a brief tutorial on using schroot.")
+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 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