X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=8622602296ecc949c3fcfb1ecd26899b932863c0;hb=7ef0d8c95980695dd186992d0882a7bfea1fecda;hp=8f353dfb08551a1fee3ca768af8b30ce894c4836;hpb=3a18a2560244c20c7aa4fa4b8378821318f22f6b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 8f353dfb0..862260229 100644
--- 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
@@ -69,7 +74,12 @@ end
 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']
@@ -100,7 +110,7 @@ unless vms.empty?
 end
 
 
-if not scope.lookupvar('::cluster').to_s.empty?
+if scope.lookupvar('::cluster').to_s != 'undefined'
   purp += "\nThis server is a node in ganeti cluster: "
   purp += scope.lookupvar('::cluster').to_s + ".\n"
   nodes = scope.lookupvar('::cluster_nodes').to_s.split.sort
@@ -125,6 +135,9 @@ purp
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+<% if @lsbdistcodename == 'wheezy' -%>
+EOD
+<% end -%>
 <%
 # vim:set et:
 # vim:set sts=2 ts=2: