From: Stephen Gran Date: Mon, 29 Jun 2009 22:19:02 +0000 (+0100) Subject: Move /etc/hosts template to hosts module X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d01180cde97856d361c3bc731185d592e7645d83;p=mirror%2Fdsa-puppet.git Move /etc/hosts template to hosts module Signed-off-by: Stephen Gran --- diff --git a/modules/hosts/manifests/init.pp b/modules/hosts/manifests/init.pp index 468107dc0..279da0f48 100644 --- 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 index 000000000..1105ac3ed --- /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 index 1105ac3ed..000000000 --- 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