Update more cookbooks

cookbooks/hostname/recipes/default.rb

@@ -31,7 +31,10 @@ if fqdn
   fqdn =~ /^([^.]+)/
   hostname = Regexp.last_match[1]
 
-  case node['platform']
+  aliases = node['hostname_cookbook']['hostsfile_aliases']
+  aliases += [hostname] if node['hostname_cookbook']['hostsfile_include_hostname_in_aliases']
+
+  case node['platform_family']
   when 'freebsd'
     directory '/etc/rc.conf.d' do
       mode '0755'
@@ -56,7 +59,7 @@ if fqdn
       notifies :reload, 'ohai[reload_hostname]', :immediately
     end
 
-  when 'centos', 'redhat', 'amazon', 'scientific'
+  when 'rhel'
     service 'network' do
       action :nothing
     end
@@ -66,6 +69,7 @@ if fqdn
       content lazy {
         ::IO.read(hostfile).gsub(/^HOSTNAME=.*$/, "HOSTNAME=#{fqdn}")
       }
+      not_if { ::IO.read(hostfile) =~ /^HOSTNAME=#{fqdn}$/ }
       notifies :reload, 'ohai[reload_hostname]', :immediately
       notifies :restart, 'service[network]', :delayed
     end
@@ -73,10 +77,13 @@ if fqdn
     sysctl = '/etc/sysctl.conf'
     file sysctl do
       action :create
+      regex = /^kernel\.hostname=.*/
+      newline = "kernel.hostname=#{hostname}"
       content lazy {
-        ::IO.read(sysctl) + "kernel.hostname=#{hostname}\n"
+        original = ::IO.read(sysctl)
+        original.match(regex) ? original.gsub(regex, newline) : original + newline
       }
-      not_if { ::IO.read(sysctl) =~ /^kernel\.hostname=#{hostname}$/ }
+      not_if { ::IO.read(sysctl).scan(regex).last == newline }
       notifies :reload, 'ohai[reload_hostname]', :immediately
       notifies :restart, 'service[network]', :delayed
     end
@@ -84,6 +91,14 @@ if fqdn
       only_if { node['hostname'] != hostname }
       notifies :reload, 'ohai[reload_hostname]', :immediately
     end
+    # update /etc/hostname in RHEL7+
+    file '/etc/hostname' do
+      content "#{hostname}\n"
+      mode '0644'
+      only_if { ::File.exist?('/etc/hostname') }
+      notifies :reload, 'ohai[reload_hostname]', :immediately
+    end
+
   else
     file '/etc/hostname' do
       content "#{hostname}\n"
@@ -106,9 +121,11 @@ if fqdn
   hostsfile_entry 'set hostname' do
     ip_address node['hostname_cookbook']['hostsfile_ip']
     hostname fqdn
-    aliases [hostname]
+    aliases aliases
+    unique true
     action :create
     notifies :reload, 'ohai[reload_hostname]', :immediately
+    only_if { node['hostname_cookbook']['append_hostsfile_ip'] }
   end
 
   ohai 'reload_hostname' do