Move /etc/hosts template to hosts module

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

diff --git a/modules/hosts/manifests/init.pp b/modules/hosts/manifests/init.pp
index 468107d..279da0f 100644 (file)
--- a/modules/hosts/manifests/init.pp
+++ b/modules/hosts/manifests/init.pp
@@ -1,7 +1,7 @@
 class hosts {
 
     file {
-        "/etc/hosts": content => template("etc-hosts.erb");
+        "/etc/hosts": content => template("hosts/etc-hosts.erb");
     }
 }
 

diff --git a/modules/hosts/templates/etc-hosts.erb b/modules/hosts/templates/etc-hosts.erb
new file mode 100644 (file)
index 0000000..1105ac3
--- /dev/null
+++ b/modules/hosts/templates/etc-hosts.erb
@@ -0,0 +1,15 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+127.0.0.1       localhost
+<%= ipaddress %>        <%= fqdn %> <%= hostname %>
+
+# The following lines are desirable for IPv6 capable hosts
+::1     localhost ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts

diff --git a/templates/etc-hosts.erb b/templates/etc-hosts.erb
deleted file mode 100644 (file)
index 1105ac3..0000000
--- a/templates/etc-hosts.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-127.0.0.1       localhost
-<%= ipaddress %>        <%= fqdn %> <%= hostname %>
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts