X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=2087cbc2b37c5c5328ab5fa1ee9dc003a2817c65;hb=6d09df7dab5dab993210e025fc2f816a78ff2d84;hp=636afc069dee16599880bcf80a77827ec49443c3;hpb=cd9391bb2ac7b909966094aaa751a7cd26fe049a;p=mirror%2Fdsa-puppet.git
diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 636afc069..2087cbc2b 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -12,12 +12,8 @@ def wrap(s, width=78)
end
def markup(l)
- if l =~ /\[\[(\*|-)?(.*?)\]\]/
- l = $2
- end
- if l =~ /\[\[(.*?)\|(.*?)\]\]/
- l = $2
- end
+ l = l.gsub(/\[\[(.*?)\|(.*?)\]\]/, '\2')
+ l = l.gsub(/\[\[(\*|-)?(.*?)\]\]/, '\2')
return l
end
@@ -28,37 +24,54 @@ end
purp += 'Welcome to ' + fqdn
if (nodeinfo['ldap'].has_key?('purpose'))
- if nodeinfo['ldap']['purpose'].include?('buildd')
+ p = nodeinfo['ldap']['purpose'].clone()
+ extra = ''
+
+ if p.delete('buildd')
purp += ", the Debian "
if nodeinfo['ldap'].has_key?('architecture')
purp += nodeinfo['ldap']['architecture'][0]
end
- purp += " build daemon\n"
- elsif nodeinfo['ldap']['purpose'].include?('porterbox')
+ purp += " build daemon"
+ end
+
+ if p.delete('porterbox')
purp += ", the Debian "
if nodeinfo['ldap'].has_key?('architecture')
purp += nodeinfo['ldap']['architecture'][0]
end
- purp += " porterbox\n"
- purp += "\n"
- purp += "See 'dchroot -l' for a list of available chroots.\n"
+ purp += " porterbox"
+ extra += "\n"
+ extra += "See 'dchroot -l' or 'schroot -l' for a list of available chroots.\n"
if nodeinfo['ldap'].has_key?('admin')
- purp += "Please contact #{nodeinfo['ldap']['admin'][0]} for install requests,\n"
- purp += "following the recommendations in .\n"
+ extra += "Please contact #{nodeinfo['ldap']['admin'][0]} for install requests,\n"
+ extra += "following the recommendations in .\n"
end
- else
+ end
+
+ if p.size() > 0
purp += ", used for the following services:\n"
nodeinfo['ldap']['purpose'].sort.each do |l|
l = markup(l)
purp += "\t" + l + "\n"
end
+ else
+ purp += ".\n"
end
+
+ purp += extra
else
- purp += "\n"
+ purp += ".\n"
end
+purp += "\n"
+
if (nodeinfo['ldap'].has_key?('physicalHost'))
- purp += "\nThis virtual server runs on the physical host #{nodeinfo['ldap']['physicalHost'][0]}.\n"
+ purp += wrap("This virtual server runs on the physical host #{nodeinfo['ldap']['physicalHost'][0]}, " +
+ "which is hosted at #{nodeinfo['hoster']['longname']}."
+ )
+elsif nodeinfo['hoster']['name']
+ purp += wrap("This server is hosted at #{nodeinfo['hoster']['longname']}.")
end
@@ -76,7 +89,7 @@ unless vms.empty?
purp += ":\n"
allnodeinfo[node]['purpose'].sort.each do |l|
l = markup(l)
- purp += "\t " + l + "\n"
+ purp += "\t " + l + "\n"
end
else
purp += "\n"