make motd check for no-backups depend on bacula::not_a_client class rather than local...

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

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index a91a163..4fb8971 100644 (file)
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -1,13 +1,13 @@
-<% if @lsbmajdistrelease >= '7' -%>
+<%- if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 -%>

 #!/bin/bash
 
 cat <<EOD
 #!/bin/bash
 
 cat <<EOD

-<% end -%>
+<%- 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 machine you agree to abide by the Debian Machines Usage Policies
 
 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 machine you agree to abide by the Debian Machines Usage Policies

-<URL:http://www.debian.org/devel/dmup>.
+<URL:https://www.debian.org/devel/dmup>.

 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 


@@ -42,7 +42,7 @@ end
 
 ninfo = scope.lookupvar('site::nodeinfo')
 
 
 ninfo = scope.lookupvar('site::nodeinfo')
 

-extra = 'Welcome to ' + fqdn
+extra = 'Welcome to ' + @fqdn

 if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose'))
   p = scope.lookupvar('site::nodeinfo')['ldap']['purpose'].clone()
   entries = ""
 if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose'))
   p = scope.lookupvar('site::nodeinfo')['ldap']['purpose'].clone()
   entries = ""


@@ -50,12 +50,13 @@ if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose'))
   if p.delete('buildd')
     entries += ", the Debian #{arch} build daemon"
   end
   if p.delete('buildd')
     entries += ", the Debian #{arch} build daemon"
   end

-  if p.delete('porterbox') or scope.lookupvar('site::nodeinfo').has_key?('porterbox')
+  if classes.include?("roles::porterbox")

     entries += ", the Debian #{arch} porterbox"
     entries += ", the Debian #{arch} porterbox"

+    p.delete('porterbox')

   end
 
   if p.size() > 0
   end
 
   if p.size() > 0

-    entries += (entries == "") ? ", " : ".  Also"
+    entries += (entries == "") ? ", " : ".  Also "

     entries +="used for the following services:\n"
     scope.lookupvar('site::nodeinfo')['ldap']['purpose'].sort.each do |l|
       l = markup(l)
     entries +="used for the following services:\n"
     scope.lookupvar('site::nodeinfo')['ldap']['purpose'].sort.each do |l|
       l = markup(l)


@@ -86,7 +87,7 @@ end
 
 vms = []
 scope.lookupvar('site::allnodeinfo').keys.sort.each do |node|
 
 vms = []
 scope.lookupvar('site::allnodeinfo').keys.sort.each do |node|

-  if scope.lookupvar('site::allnodeinfo')[node]['physicalHost'] and scope.lookupvar('site::allnodeinfo')[node]['physicalHost'].include?(fqdn)
+  if scope.lookupvar('site::allnodeinfo')[node]['physicalHost'] and scope.lookupvar('site::allnodeinfo')[node]['physicalHost'].include?(@fqdn)

     vms << node
   end
 end
     vms << node
   end
 end


@@ -107,15 +108,13 @@ unless vms.empty?
 end
 
 
 end
 
 

-if scope.lookupvar('::cluster').to_s != 'undefined'
+if scope.lookupvar('::cluster')

   purp += "\n This server is a node in ganeti cluster: "
   purp += scope.lookupvar('::cluster').to_s + ":\n"
   purp += "\t" + scope.lookupvar('::cluster_nodes').split.sort.map{ |x| x.split('.')[0] }.join(", ") + ".\n"
 
   purp += "\n This server is a node in ganeti cluster: "
   purp += scope.lookupvar('::cluster').to_s + ":\n"
   purp += "\t" + scope.lookupvar('::cluster_nodes').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
+  purp += ""
+  purp += "\tCurrently the master node is $(cat /var/lib/ganeti/ssconf_master_node).\n"

   #nodes = scope.lookupvar('::cluster_nodes').sort
   #nodes.each do |node|
   #  purp += "\t" + node + "\n"
   #nodes = scope.lookupvar('::cluster_nodes').sort
   #nodes.each do |node|
   #  purp += "\t" + node + "\n"


@@ -129,11 +128,11 @@ if scope.lookupvar('::cluster').to_s != 'undefined'
 end
 
 
 end
 
 

-if scope.lookupvar('site::nodeinfo').has_key?('porterbox')
-  purp += "\n " + wrap("Disk space on porter boxes is often limited.  Please respect your fellow porters by cleaning up after yourself and deleting schroots and source/build trees in your ~ as soon as feasible.  DSA reserves the right to recover disk space as necessary.  See <URL:http://dsa.debian.org/doc/schroot/> for a brief tutorial on using schroot.")
+if classes.include?("roles::porterbox")
+  purp += "\n " + wrap("Disk space on porter boxes is often limited.  Please respect your fellow porters by cleaning up after yourself and deleting schroots and source/build trees in your ~ as soon as feasible.  DSA reserves the right to recover disk space as necessary.  See <URL:https://dsa.debian.org/doc/schroot/> for a brief tutorial on using schroot.  There may be chroots for architectures other than #{arch} available, please list available chroots to check.")

 end
 
 end
 

-if ninfo['not-bacula-client'] then
+if classes.include?('bacula::not_a_client') then

   purp += "\n " + wrap("Note that this host is _NOT_ being backed up.  If you care about your data, run your own backups.")
 end
 
   purp += "\n " + wrap("Note that this host is _NOT_ being backed up.  If you care about your data, run your own backups.")
 end
 


@@ -145,9 +144,9 @@ purp
 -%>
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 -%>
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 

-<% if @lsbmajdistrelease >= '7' -%>
+<%- if scope.call_function('versioncmp', [@lsbmajdistrelease, '8']) <= 0 -%>

 EOD
 EOD

-<% end -%>
+<%- end -%>

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