remove porterbox purpose when we add the porterbox blurb to the motd

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

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

 #!/bin/bash
 
 cat <<EOD
 #!/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 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>.

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


@@ -48,8 +50,9 @@ 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 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


@@ -125,7 +128,7 @@ if scope.lookupvar('::cluster')
 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
 


@@ -141,7 +144,9 @@ purp
 -%>
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 -%>
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 

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

 EOD
 EOD

+<%- end -%>

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