move things from modules/roles/static* to modules/static*

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

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index bd50962..573ad88 100644 (file)
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -7,7 +7,7 @@ cat <<EOD
 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>.

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


@@ -29,35 +29,37 @@ def markup(l)
   return l
 end
 
   return l
 end
 

-if scope.lookupvar('site::nodeinfo')['ldap'].has_key?('architecture')
-  arch = scope.lookupvar('site::nodeinfo')['ldap']['architecture'][0]
+if scope.lookupvar('deprecated::nodeinfo')['ldap'].has_key?('architecture')
+  arch = scope.lookupvar('deprecated::nodeinfo')['ldap']['architecture'][0]

 else
   arch = 'unknown'
 end
 
 purp = ''
 else
   arch = 'unknown'
 end
 
 purp = ''

-if scope.lookupvar('site::nodeinfo').has_key?('nameinfo')
-  purp += " " + wrap(scope.lookupvar('site::nodeinfo')['nameinfo']) + "\n"
+if scope.lookupvar('deprecated::nodeinfo').has_key?('nameinfo')
+  purp += " " + wrap(scope.lookupvar('deprecated::nodeinfo')['nameinfo']) + "\n"

 end
 
 end
 

-ninfo = scope.lookupvar('site::nodeinfo')
+ninfo = scope.lookupvar('deprecated::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()
+if (scope.lookupvar('deprecated::nodeinfo')['ldap'].has_key?('purpose'))
+  p = scope.lookupvar('deprecated::nodeinfo')['ldap']['purpose'].clone()

   entries = ""
 
   entries = ""
 

-  if p.delete('buildd')
+  if classes.include?("roles::buildd")

     entries += ", the Debian #{arch} build daemon"
     entries += ", the Debian #{arch} build daemon"

+    p.delete('buildd')

   end
   end

-  if p.delete('porterbox') or classes.include?("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"
     entries +="used for the following services:\n"

-    scope.lookupvar('site::nodeinfo')['ldap']['purpose'].sort.each do |l|
+    scope.lookupvar('deprecated::nodeinfo')['ldap']['purpose'].sort.each do |l|

       l = markup(l)
       entries += "\t#{l}\n"
     end
       l = markup(l)
       entries += "\t#{l}\n"
     end


@@ -70,7 +72,7 @@ else
 end
 purp += " " + wrap(extra) + "\n"
 
 end
 purp += " " + wrap(extra) + "\n"
 

-if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('physicalHost'))
+if (scope.lookupvar('deprecated::nodeinfo')['ldap'].has_key?('physicalHost'))

   if ninfo['ldap']['physicalHost'][0] =~ /ganeti/
     phys_host = 'cluster'
   else
   if ninfo['ldap']['physicalHost'][0] =~ /ganeti/
     phys_host = 'cluster'
   else


@@ -79,14 +81,14 @@ if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('physicalHost'))
   purp += wrap(" This virtual server runs on the #{phys_host} #{ninfo['ldap']['physicalHost'][0]}, " +
                "which is hosted at #{ninfo['hoster']['longname']}."
                )
   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']
+elsif scope.lookupvar('deprecated::nodeinfo')['hoster']['name']

   purp += wrap(" This server is hosted at #{ninfo['hoster']['longname']}.")
 end
 
 
 vms = []
   purp += wrap(" This server is hosted at #{ninfo['hoster']['longname']}.")
 end
 
 
 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)
+scope.lookupvar('deprecated::allnodeinfo').keys.sort.each do |node|
+  if scope.lookupvar('deprecated::allnodeinfo')[node]['physicalHost'] and scope.lookupvar('deprecated::allnodeinfo')[node]['physicalHost'].include?(@fqdn)

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


@@ -94,9 +96,9 @@ unless vms.empty?
   purp += "\nThe following virtual machines run on this system:\n"
   vms.each do |node|
     purp += "\t- #{node}"
   purp += "\nThe following virtual machines run on this system:\n"
   vms.each do |node|
     purp += "\t- #{node}"

-    if scope.lookupvar('site::allnodeinfo')[node]['purpose']
+    if scope.lookupvar('deprecated::allnodeinfo')[node]['purpose']

       purp += ":\n"
       purp += ":\n"

-      scope.lookupvar('site::allnodeinfo')[node]['purpose'].sort.each do |l|
+      scope.lookupvar('deprecated::allnodeinfo')[node]['purpose'].sort.each do |l|

         l = markup(l)
         purp += "\t    " + l + "\n"
       end
         l = markup(l)
         purp += "\t    " + l + "\n"
       end


@@ -120,23 +122,23 @@ if scope.lookupvar('::cluster')
   #end
   #nodes.reject{|node| node.eql?(fqdn)}.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|
+  #  scope.lookupvar('deprecated::allnodeinfo')[node]['ipHostNumber'].each do |ip|

   #    purp += "\t\t" + ip + "\n"
   #  end
   #end
 end
 
 
   #    purp += "\t\t" + ip + "\n"
   #  end
   #end
 end
 
 

-if classes.include?("porterbox")
+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
 
   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
 

-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
 

-if scope.lookupvar('site::nodeinfo').has_key?('footer')
-  purp += "\n" + wrap(scope.lookupvar('site::nodeinfo')['footer'])
+if scope.lookupvar('deprecated::nodeinfo').has_key?('footer')
+  purp += "\n" + wrap(scope.lookupvar('deprecated::nodeinfo')['footer'])

 end
 
 purp
 end
 
 purp