From 99a240edf26ac2b3102175fe8cfc2638d8d0081c Mon Sep 17 00:00:00 2001
From: jtimberman <joshua@opscode.com>
Date: Sat, 20 Oct 2012 12:16:31 -0600
Subject: [PATCH] [COOK-1790] - move aliases template to default

---
 templates/default/aliases.erb | 11 +++++++++++
 templates/ubuntu/aliases.erb  |  7 -------
 2 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 templates/default/aliases.erb
 delete mode 100644 templates/ubuntu/aliases.erb

diff --git a/templates/default/aliases.erb b/templates/default/aliases.erb
new file mode 100644
index 0000000..9a54578
--- /dev/null
+++ b/templates/default/aliases.erb
@@ -0,0 +1,11 @@
+#
+# This file is generated by Chef for <%= node['fqdn'] %>
+#
+# Local changes will be overwritten
+#
+# See man 5 aliases for format
+postmaster:    root
+
+<% node['postfix']['aliases'].each do |name, value| %>
+<%= name %>:  "<%= value %>"
+<% end unless node['postfix']['aliases'].nil? %>
diff --git a/templates/ubuntu/aliases.erb b/templates/ubuntu/aliases.erb
deleted file mode 100644
index 0e10c91..0000000
--- a/templates/ubuntu/aliases.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-# See man 5 aliases for format
-postmaster:    root
-
-<% node[:postfix][:aliases].each do |name, value| %>
-<%= name %>:  "<%= value %>"
-<% end unless node[:postfix][:aliases].nil? %>
-