Drop NFS server role from planet servers

[chef.git] / cookbooks / nfs / recipes / server.rb

diff --git a/cookbooks/nfs/recipes/server.rb b/cookbooks/nfs/recipes/server.rb
index 508d14eca99de4a5f723400c04d067480de0b4f3..93fad876c707d99ebb17c4bbdf4989a0ce41b74d 100644 (file)
--- a/cookbooks/nfs/recipes/server.rb
+++ b/cookbooks/nfs/recipes/server.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: nfs
+# Cookbook:: nfs
 # Recipe:: server
 #
-# Copyright 2010, OpenStreetMap Foundation
+# Copyright:: 2010, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,32 +19,30 @@
 
 package "nfs-kernel-server"
 
-service "portmap" do
-  action [ :enable, :start ]
-  supports :status => true, :restart => true, :reload => true
+service "rpcbind" do
+  action [:enable, :start]
 end
 
-#service "nfs-kernel-server" do
-#  action [ :enable, :start ]
-#  supports :status => true, :restart => true, :reload => true
-#end
+service "nfs-server" do
+  action [:enable, :start]
+end
 
 exports = {}
 
 search(:node, "*:*") do |client|
-  if client[:nfs]
-    client[:nfs].each_value do |mount|
-      if mount[:host] == node[:hostname]
-        client.ipaddresses do |address|
-          exports[mount[:path]] ||= {}
+  next unless client[:nfs]
+
+  client[:nfs].each_value do |mount|
+    next unless mount[:host] == node[:hostname]
+
+    client.ipaddresses do |address|
+      exports[mount[:path]] ||= {}
 
-          if mount[:readonly]
-            exports[mount[:path]][address] = "ro"
-          else
-            exports[mount[:path]][address] = "rw"
-          end
-        end
-      end
+      exports[mount[:path]][address] = if mount[:readonly]
+                                         "ro"
+                                       else
+                                         "rw"
+                                       end
     end
   end
 end
@@ -58,7 +56,7 @@ template "/etc/exports" do
   source "exports.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode "644"
   variables :exports => exports
   notifies :run, "execute[exportfs]"
 end