reformat

phunehehe · Jun 6, 2014 · 86656c5 · 86656c5
1 parent 97b50ca
commit 86656c5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 25 deletions.
diff --git a/resolver/attributes/default.rb b/resolver/attributes/default.rb
@@ -17,7 +17,6 @@
 #
 
 
-default['resolver']['search'] = node['domain']
-default['resolver']['nameservers'] = []
-default['resolver']['options'] = {}
-default['resolver']['server_role'] = 'nameserver'
+default[:resolver][:search] = node[:domain]
+default[:resolver][:options] = {}
+default[:resolver][:server_role] = 'nameserver'
diff --git a/resolver/recipes/default.rb b/resolver/recipes/default.rb
@@ -22,12 +22,12 @@
 if node[:resolver][:nameservers].empty?
     raise 'node[:resolver][:nameservers] must not be empty'
 else
-  template "/etc/resolv.conf" do
-    source "resolv.conf.erb"
-    owner "root"
-    group "root"
-    mode 0644
-    # This syntax makes the resolver sub-keys available directly
-    variables node['resolver']
-  end
+    template '/etc/resolv.conf' do
+        source 'resolv.conf.erb'
+        owner 'root'
+        group 'root'
+        mode '644'
+        # This syntax makes the resolver sub-keys available directly
+        variables node[:resolver]
+    end
 end
diff --git a/resolver/recipes/from_server_role.rb b/resolver/recipes/from_server_role.rb
@@ -18,19 +18,19 @@
 #
 
 nameservers =
-  search(:node, "role:#{node['resolver']['server_role']} AND chef_environment:#{node.chef_environment}").
-    map {|node| node['ipaddress'] } +
-  node['resolver']['nameservers']
+    search(:node, "role:#{node[:resolver][:server_role]} AND chef_environment:#{node.chef_environment}").
+        map {|node| node[:ipaddress] } +
+    node[:resolver][:nameservers]
 
-template "/etc/resolv.conf" do
-  source "resolv.conf.erb"
-  owner "root"
-  group "root"
-  mode 0644
-  variables(
-    'search' => node['resolver']['search'],
-    'nameservers' => nameservers,
-    'options' => node['resolver']['options']
-  )
+template '/etc/resolv.conf' do
+    source 'resolv.conf.erb'
+    owner 'root'
+    group 'root'
+    mode '644'
+    variables(
+        'search' => node[:resolver][:search],
+        'nameservers' => nameservers,
+        'options' => node[:resolver][:options]
+    )
 end