From 75af023c864d1b6c4e48788b1b4cf7aad5eb2204 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Mon, 9 Jul 2012 16:41:45 -0400 Subject: Revert back to using cheetah + adjust resultant code + templates At this point there is a mixture of "double hash" cheetah comments and '#*' cheetah comments. --- templates/hosts.ubuntu.tmpl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'templates/hosts.ubuntu.tmpl') diff --git a/templates/hosts.ubuntu.tmpl b/templates/hosts.ubuntu.tmpl index 9eebe971..ae120b02 100644 --- a/templates/hosts.ubuntu.tmpl +++ b/templates/hosts.ubuntu.tmpl @@ -1,7 +1,9 @@ -{{# This file /etc/cloud/templates/hosts.tmpl is only utilized - if enabled in cloud-config. Specifically, in order to enable it - you need to add the following to config: - manage_etc_hosts: True}} +## This file (/etc/cloud/templates/hosts.tmpl) is only utilized +## if enabled in cloud-config. Specifically, in order to enable it +## you need to add the following to config: +## manage_etc_hosts: True +## +## Note, double-hash commented lines will not appear in /etc/hosts # # Your system has configured 'manage_etc_hosts' as True. # As a result, if you wish for changes to this file to persist @@ -10,8 +12,8 @@ # b.) change or remove the value of 'manage_etc_hosts' in # /etc/cloud/cloud.cfg or cloud-config from user-data # -# The following lines are desirable for IPv4 capable hosts -127.0.1.1 {{fqdn}} {{hostname}} +## The value '$hostname' will be replaced with the local-hostname +127.0.1.1 $fqdn $hostname 127.0.0.1 localhost # The following lines are desirable for IPv6 capable hosts @@ -21,4 +23,3 @@ ff00::0 ip6-mcastprefix ff02::1 ip6-allnodes ff02::2 ip6-allrouters ff02::3 ip6-allhosts - -- cgit v1.2.3