From: Stephen Gran <steve@lobefin.net>
Date: Sun, 26 Apr 2009 16:00:19 +0000 (+0100)
Subject: Begin cleaning up templates into the module namespace - I think we're
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=86bf9c4bc0efb54a2d9beed89508a1e415f4fa98;p=mirror%2Fdsa-puppet.git

Begin cleaning up templates into the module namespace - I think we're
going to be using a lot more templates in the future
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/motd/manifests/init.pp b/modules/motd/manifests/init.pp
index 9fedde753..fb2a20e94 100644
--- a/modules/motd/manifests/init.pp
+++ b/modules/motd/manifests/init.pp
@@ -1,7 +1,7 @@
 class motd {
 	file { "/etc/motd.tail":
                 notify  => Exec["updatemotd"],
-                content => template("motd.erb") ;
+                content => template("motd/motd.erb") ;
 	}
         exec { "updatemotd":
                 command => "uname -snrvm > /var/run/motd && cat /etc/motd.tail >> /var/run/motd",
diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
new file mode 100644
index 000000000..b186dc917
--- /dev/null
+++ b/modules/motd/templates/motd.erb
@@ -0,0 +1,55 @@
+This device is for authorized users only.  All traffic on this device
+is monitored and will be used as evidence for prosecutions.
+
+** IMPORTANT WARNING **
+
+Please read:
+
+http://lists.debian.org/debian-devel-announce/2003/debian-devel-announce-200312/msg00001.html
+
+before doing anything on these machines - especially the "What to do
+when you can login" section.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+<%=
+purp = ''
+if nodeinfo.has_key?('nameinfo')
+  purp += nodeinfo['nameinfo'] + "\n\n"
+end
+
+purp += 'Welcome to ' + fqdn
+if (nodeinfo['ldap'].at(0)) and (nodeinfo['ldap'][0].has_key?('purpose'))
+  if nodeinfo['ldap'][0]['purpose'].include?('buildd')
+    purp += ", the Debian "
+    if nodeinfo['ldap'][0].has_key?('architecture')
+      purp += nodeinfo['ldap'][0]['architecture'][0]
+    end
+    purp += " build daemon\n"
+  elsif nodeinfo['ldap'][0]['purpose'].include?('porterbox')
+    purp += ", the Debian "
+    if nodeinfo['ldap'][0].has_key?('architecture')
+      purp += nodeinfo['ldap'][0]['architecture'][0]
+    end
+    purp += " porterbox\n"
+  else
+    purp += ", used for the following services:\n"
+    nodeinfo['ldap'][0]['purpose'].sort.each do |l|
+      if l =~ /\[\[(\*|-)?(.*?)\]\]/
+        l = $2
+      end
+      if l =~ /\[\[(.*?)\|(.*?)\]\]/
+        l = $2
+      end
+      purp += "\t" + l + "\n"
+    end
+  end
+end
+
+if nodeinfo.has_key?('footer')
+  purp += "\n" + nodeinfo['footer'] + "\n"
+end
+purp
+-%>
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/templates/motd.erb b/templates/motd.erb
deleted file mode 100644
index b186dc917..000000000
--- a/templates/motd.erb
+++ /dev/null
@@ -1,55 +0,0 @@
-This device is for authorized users only.  All traffic on this device
-is monitored and will be used as evidence for prosecutions.
-
-** IMPORTANT WARNING **
-
-Please read:
-
-http://lists.debian.org/debian-devel-announce/2003/debian-devel-announce-200312/msg00001.html
-
-before doing anything on these machines - especially the "What to do
-when you can login" section.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-<%=
-purp = ''
-if nodeinfo.has_key?('nameinfo')
-  purp += nodeinfo['nameinfo'] + "\n\n"
-end
-
-purp += 'Welcome to ' + fqdn
-if (nodeinfo['ldap'].at(0)) and (nodeinfo['ldap'][0].has_key?('purpose'))
-  if nodeinfo['ldap'][0]['purpose'].include?('buildd')
-    purp += ", the Debian "
-    if nodeinfo['ldap'][0].has_key?('architecture')
-      purp += nodeinfo['ldap'][0]['architecture'][0]
-    end
-    purp += " build daemon\n"
-  elsif nodeinfo['ldap'][0]['purpose'].include?('porterbox')
-    purp += ", the Debian "
-    if nodeinfo['ldap'][0].has_key?('architecture')
-      purp += nodeinfo['ldap'][0]['architecture'][0]
-    end
-    purp += " porterbox\n"
-  else
-    purp += ", used for the following services:\n"
-    nodeinfo['ldap'][0]['purpose'].sort.each do |l|
-      if l =~ /\[\[(\*|-)?(.*?)\]\]/
-        l = $2
-      end
-      if l =~ /\[\[(.*?)\|(.*?)\]\]/
-        l = $2
-      end
-      purp += "\t" + l + "\n"
-    end
-  end
-end
-
-if nodeinfo.has_key?('footer')
-  purp += "\n" + nodeinfo['footer'] + "\n"
-end
-purp
--%>
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%