X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=7e6446e0582ee8ba4a88c81991b7f1a9a26038a6;hb=946a95b2879d19c72c8b78f5fce685f91d01ecbb;hp=bd50962e13f53536d6f01da4587c6c367a82e304;hpb=71127bee2ef446cee2444cf2ab360c459db9b5a8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index bd50962e1..7e6446e05 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -7,7 +7,7 @@ cat <<EOD
 This device is for authorized users only.  All traffic on this device
 is monitored and will be used as evidence for prosecutions.  By using
 this machine you agree to abide by the Debian Machines Usage Policies
-<URL:http://www.debian.org/devel/dmup>.
+<URL:https://www.debian.org/devel/dmup>.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -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 p.delete('porterbox') or classes.include?("porterbox")
+  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)
@@ -127,11 +129,11 @@ 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
 
-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