From cd6254e6d6e341a921015d6c8192953aa004ffb7 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Wed, 22 Apr 2009 23:56:33 +0100 Subject: [PATCH] Test penalosa with a footer this time Signed-off-by: Stephen Gran --- manifests/site.pp | 1 + modules/motd/files/penalosa.debian.org/motd.tail | 2 ++ templates/motd.erb | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 modules/motd/files/penalosa.debian.org/motd.tail diff --git a/manifests/site.pp b/manifests/site.pp index 86b8c718a..fce042a4b 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -63,4 +63,5 @@ node default { 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 index 000000000..799dd8ef6 --- /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 c3132a52b..92af9d756 100644 --- 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. -<% 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 -%> -- 2.20.1