Test penalosa with a footer this time

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/manifests/site.pp b/manifests/site.pp
index 86b8c718aeff8a7f01dd743775038303bae3adce..fce042a4b3f3b3cdd8db0082ca9c1b0ea05fed2b 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -63,4 +63,5 @@ node default {
 
 node penalosa inherits default {
     include hosts
 
 node penalosa inherits default {
     include hosts

+    include motd

 }
 }

diff --git a/modules/motd/files/penalosa.debian.org/motd.tail b/modules/motd/files/penalosa.debian.org/motd.tail
new file mode 100644 (file)
index 0000000..799dd8e
--- /dev/null
+++ b/modules/motd/files/penalosa.debian.org/motd.tail
@@ -0,0 +1,2 @@
+Francisco de Peñalosa (c. 1470 – April 1, 1528) was a Spanish composer
+of the early Renaissance.

diff --git a/templates/motd.erb b/templates/motd.erb
index c3132a52b7d0df901f4e79e11c3e9497a2e10450..92af9d756d2aa24bfe3a0443b7ef582e50e66c73 100644 (file)
--- a/templates/motd.erb
+++ b/templates/motd.erb
@@ -1,6 +1,6 @@
 This device is for authorized users only.  All traffic on this device
 is monitored and will be used as evidence for prosecutions.
 
 This device is for authorized users only.  All traffic on this device
 is monitored and will be used as evidence for prosecutions.
 

-<% if File.exists?("/etc/puppet/modules/motd/files/$fqdn/motd-footer") -%>
-<% File.open("/etc/puppet/modules/motd/files/$fqdn/motd-footer").read -%>
+<% if File.exists?("/etc/puppet/modules/motd/files/$fqdn/motd.tail") -%>
+<% File.open("/etc/puppet/modules/motd/files/$fqdn/motd.tail").read -%>

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