projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
this should make picconi handle mail
[mirror/dsa-puppet.git]
/
modules
/
motd
/
templates
/
motd.erb
diff --git
a/modules/motd/templates/motd.erb
b/modules/motd/templates/motd.erb
index
d5cc580
..
8622602
100644
(file)
--- a/
modules/motd/templates/motd.erb
+++ b/
modules/motd/templates/motd.erb
@@
-1,3
+1,8
@@
+<% if @lsbdistcodename == 'wheezy' -%>
+#!/bin/bash
+
+cat <<EOD
+<% end -%>
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 device is for authorized users only. All traffic on this device
is monitored and will be used as evidence for prosecutions. By using
@@
-69,7
+74,12
@@
end
purp += "\n"
if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('physicalHost'))
purp += "\n"
if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('physicalHost'))
- purp += wrap("This virtual server runs on the physical host #{ninfo['ldap']['physicalHost'][0]}, " +
+ if ninfo['ldap']['physicalHost'][0] =~ /ganeti/
+ phys_host = 'cluster'
+ else
+ phys_host = 'physical host'
+ end
+ purp += wrap("This virtual server runs on the #{phys_host} #{ninfo['ldap']['physicalHost'][0]}, " +
"which is hosted at #{ninfo['hoster']['longname']}."
)
elsif scope.lookupvar('site::nodeinfo')['hoster']['name']
"which is hosted at #{ninfo['hoster']['longname']}."
)
elsif scope.lookupvar('site::nodeinfo')['hoster']['name']
@@
-100,12
+110,19
@@
unless vms.empty?
end
end
-if scope.lookupvar('::cluster')
+if scope.lookupvar('::cluster')
.to_s != 'undefined'
purp += "\nThis server is a node in ganeti cluster: "
purp += "\nThis server is a node in ganeti cluster: "
- purp += scope.lookupvar('::cluster') + ".\n"
- scope.lookupvar('::cluster_nodes').split.each do |node|
+ purp += scope.lookupvar('::cluster').to_s + ".\n"
+ nodes = scope.lookupvar('::cluster_nodes').to_s.split.sort
+ nodes.each do |node|
purp += "\t" + node + "\n"
end
purp += "\t" + node + "\n"
end
+ nodes.reject{|node| node.eql?(fqdn)}.each do |node|
+ purp += "\t" + node + "\n"
+ scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
+ purp += "\t\t" + ip + "\n"
+ end
+ end
end
end
@@
-118,6
+135,9
@@
purp
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+<% if @lsbdistcodename == 'wheezy' -%>
+EOD
+<% end -%>
<%
# vim:set et:
# vim:set sts=2 ts=2:
<%
# vim:set et:
# vim:set sts=2 ts=2: