projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6588303
)
Try new motd
author
Peter Palfrader
<peter@palfrader.org>
Wed, 21 Mar 2012 11:05:04 +0000
(12:05 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Wed, 21 Mar 2012 11:05:04 +0000
(12:05 +0100)
modules/motd/templates/motd.erb
patch
|
blob
|
history
diff --git
a/modules/motd/templates/motd.erb
b/modules/motd/templates/motd.erb
index
496b5dd
..
29326b4
100644
(file)
--- a/
modules/motd/templates/motd.erb
+++ b/
modules/motd/templates/motd.erb
@@
-24,37
+24,52
@@
end
purp += 'Welcome to ' + fqdn
if (nodeinfo['ldap'].has_key?('purpose'))
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"
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')
+ end
+
+ if p.delete('porterbox')
purp += ", the Debian "
if nodeinfo['ldap'].has_key?('architecture')
purp += nodeinfo['ldap']['architecture'][0]
end
purp += " porterbox\n"
purp += ", the Debian "
if nodeinfo['ldap'].has_key?('architecture')
purp += nodeinfo['ldap']['architecture'][0]
end
purp += " porterbox\n"
-
purp
+= "\n"
-
purp
+= "See 'dchroot -l' or 'schroot -l' for a list of available chroots.\n"
+
extra
+= "\n"
+
extra
+= "See 'dchroot -l' or 'schroot -l' for a list of available chroots.\n"
if nodeinfo['ldap'].has_key?('admin')
if nodeinfo['ldap'].has_key?('admin')
-
purp
+= "Please contact #{nodeinfo['ldap']['admin'][0]} for install requests,\n"
-
purp
+= "following the recommendations in <URL:http://dsa.debian.org/doc/install-req/>.\n"
+
extra
+= "Please contact #{nodeinfo['ldap']['admin'][0]} for install requests,\n"
+
extra
+= "following the recommendations in <URL:http://dsa.debian.org/doc/install-req/>.\n"
end
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
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
end
+
+ purp += extra
else
else
- purp += "\n"
+ purp += "
.
\n"
end
if (nodeinfo['ldap'].has_key?('physicalHost'))
end
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]}." +
+ "It is hosted at #{nodeinfo['hoster']['longname']}."
+ )
+elsif nodeinfo['hoster']['name']
+ purp += wrap("This server is hosted at #{nodeinfo['hoster']['longname']}.")
end
end