motd: squeeze cleanup

Signed-off-by: Julien Cristau <jcristau@debian.org>

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index 8936206..cb42099 100644 (file)
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -7,23 +7,12 @@
 #   include motd
 #
 class motd {
 #   include motd
 #
 class motd {

-       if $::lsbmajdistrelease >= 7 {
-               $fname  = '/etc/update-motd.d/puppet-motd'
-               $notify = undef
-               $mode   = '0555'
-
-               file { '/etc/update-motd.d':
-                       ensure => directory,
-                       mode   => '0755'
-               }
-               file { '/etc/motd.tail':
-                       ensure => absent,
-               }
-       } else {
-               $fname  = '/etc/motd.tail'
-               $notify = Exec['updatemotd']
-               $mode   = '0444'
-
+       file { '/etc/update-motd.d':
+               ensure => directory,
+               mode   => '0755'
+       }
+       file { '/etc/motd.tail':
+               ensure => absent,

        }
 
        file { '/etc/motd':
        }
 
        file { '/etc/motd':


@@ -31,9 +20,9 @@ class motd {
                target => '/var/run/motd'
        }
 
                target => '/var/run/motd'
        }
 

-       file { $fname:
-               notify  => $notify,
-               mode    => $mode,
+       file { '/etc/update-motd.d/puppet-motd':
+               notify  => undef,
+               mode    => '0555',

                content => template('motd/motd.erb')
        }
 
                content => template('motd/motd.erb')
        }
 

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 43753f3..686f630 100644 (file)
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -1,8 +1,6 @@
-<% if @lsbmajdistrelease >= '7' -%>

 #!/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 device is for authorized users only.  All traffic on this device
 is monitored and will be used as evidence for prosecutions.  By using


@@ -112,10 +110,8 @@ if scope.lookupvar('::cluster')
   purp += scope.lookupvar('::cluster').to_s + ":\n"
   purp += "\t" + scope.lookupvar('::cluster_nodes').split.sort.map{ |x| x.split('.')[0] }.join(", ") + ".\n"
 
   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"


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

-<% if @lsbmajdistrelease >= '7' -%>

 EOD
 EOD

-<% end -%>

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