Replace porterbox motd with link to wiki.

[dsa-puppet.git] / modules / motd / templates / motd.erb

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 1a3bf1988e3dd41033e7025804f03b65d1df633c..5c440cdf9934a8199fd48251ecc90fabb1234227 100644 (file)
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -1,3 +1,8 @@
+<% if @lsbmajdistrelease >= '7' -%>
+#!/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


@@ -44,10 +49,15 @@ if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose'))
     end
     purp += " porterbox"
     extra += "\n"
     end
     purp += " porterbox"
     extra += "\n"

-    extra += "See 'dchroot -l' or 'schroot -l' for a list of available chroots.\n"
-    if scope.lookupvar('site::nodeinfo')['ldap'].has_key?('admin')
-      extra += "Please contact #{ninfo['ldap']['admin'][0]} for install requests,\n"
-      extra += "following the recommendations in <URL:http://dsa.debian.org/doc/install-req/>.\n"
+    if classes.include?("porterbox")
+      extra += "For an introduction to the porterbox 'schroot' tool, see:\n"
+      extra += "  <URL:http://dsa.debian.org/doc/schroot/>.\n"
+    else
+      extra += "See 'dchroot -l' or 'schroot -l' for a list of available chroots.\n"
+      if scope.lookupvar('site::nodeinfo')['ldap'].has_key?('admin')
+        extra += "Please contact #{ninfo['ldap']['admin'][0]} for install requests,\n"
+        extra += "following the recommendations in <URL:http://dsa.debian.org/doc/install-req/>.\n"
+      end

     end
   end
 
     end
   end
 


@@ -69,7 +79,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,16 +115,25 @@ unless vms.empty?
 end
 
 
 end
 
 

-if scope.hiera('cluster')
-  purp += "\nganeti cluster: " + hiera('cluster') + " contains these nodes:\n"
-  scope.hiera_array('nodes').each do |node|
-    purp += "\t" + node
-    if node.eql?(fqdn)
-      purp += " (this system)"
-    end
-    purp += "\n"
+if scope.lookupvar('::cluster').to_s != 'undefined'
+  purp += "\nThis server is a node in ganeti cluster: "
+  purp += scope.lookupvar('::cluster').to_s + ":\n"
+  purp += "\t" + scope.lookupvar('::cluster_nodes').to_s.split.sort.map{ |x| x.split('.')[0] }.join(", ") + ".\n"
+
+  if @lsbmajdistrelease >= '7'
+    purp += ""
+    purp += "\tCurrently the master node is $(cat /var/lib/ganeti/ssconf_master_node).\n"

   end
   end

-  purp += "\n"
+  #nodes = scope.lookupvar('::cluster_nodes').to_s.split.sort
+  #nodes.each do |node|
+  #  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
 
 


@@ -122,6 +146,9 @@ purp
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 

+<% if @lsbmajdistrelease >= '7' -%>
+EOD
+<% end -%>

 <%
 # vim:set et:
 # vim:set sts=2 ts=2:
 <%
 # vim:set et:
 # vim:set sts=2 ts=2: