projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DMUP exists
[mirror/dsa-puppet.git]
/
modules
/
motd
/
templates
/
motd.erb
diff --git
a/modules/motd/templates/motd.erb
b/modules/motd/templates/motd.erb
index
fbe1180
..
cd0060f
100644
(file)
--- a/
modules/motd/templates/motd.erb
+++ b/
modules/motd/templates/motd.erb
@@
-15,28
+15,28
@@
if nodeinfo.has_key?('nameinfo')
end
purp += 'Welcome to ' + fqdn
end
purp += 'Welcome to ' + fqdn
-if (nodeinfo['ldap'].
at(0)) and (nodeinfo['ldap'][0].
has_key?('purpose'))
- if nodeinfo['ldap'][
0][
'purpose'].include?('buildd')
+if (nodeinfo['ldap'].has_key?('purpose'))
+ if nodeinfo['ldap']['purpose'].include?('buildd')
purp += ", the Debian "
purp += ", the Debian "
- if nodeinfo['ldap']
[0]
.has_key?('architecture')
- purp += nodeinfo['ldap'][
0][
'architecture'][0]
+ if nodeinfo['ldap'].has_key?('architecture')
+ purp += nodeinfo['ldap']['architecture'][0]
end
purp += " build daemon\n"
end
purp += " build daemon\n"
- elsif nodeinfo['ldap'][
0][
'purpose'].include?('porterbox')
+ elsif nodeinfo['ldap']['purpose'].include?('porterbox')
purp += ", the Debian "
purp += ", the Debian "
- if nodeinfo['ldap']
[0]
.has_key?('architecture')
- purp += nodeinfo['ldap'][
0][
'architecture'][0]
+ 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"
end
purp += " porterbox\n"
purp += "\n"
purp += "See 'dchroot -l' for a list of available chroots.\n"
- if nodeinfo['ldap']
[0]
.has_key?('admin')
- purp += "Please contact #{nodeinfo['ldap'][
0][
'admin'][0]} for install requests,\n"
+ 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"
end
else
purp += ", used for the following services:\n"
purp += "following the recommendations in <URL:http://dsa.debian.org/doc/install-req/>.\n"
end
else
purp += ", used for the following services:\n"
- nodeinfo['ldap'][
0][
'purpose'].sort.each do |l|
+ nodeinfo['ldap']['purpose'].sort.each do |l|
if l =~ /\[\[(\*|-)?(.*?)\]\]/
l = $2
end
if l =~ /\[\[(\*|-)?(.*?)\]\]/
l = $2
end
@@
-50,12
+50,19
@@
else
purp += "\n"
end
purp += "\n"
end
+if (nodeinfo['ldap'].has_key?('physicalHost'))
+ purp += "\nThis virtual server runs on the physical host #{nodeinfo['ldap']['physicalHost'][0]}.\n"
+end
+
if nodeinfo.has_key?('footer')
if nodeinfo.has_key?('footer')
- purp += "\n" +
nodeinfo['footer']
+ "\n"
+ purp += "\n" +
wrap(nodeinfo['footer'])
+ "\n"
end
purp
-%>
end
purp
-%>
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ By connecting to this maching you agree to abide to the Debian
+ Machines Usage Policies (http://www.debian.org/devel/dmup)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<%