X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/fb1f1d56e8d8a6a86b79c71546e6c114fec2640c..45dde9418dd342bb1a632d82559201c0b3becf1a:/cookbooks/nfs/recipes/server.rb

diff --git a/cookbooks/nfs/recipes/server.rb b/cookbooks/nfs/recipes/server.rb
index f75e44e88..0378075fd 100644
--- 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,
@@ -20,15 +20,12 @@
 package "nfs-kernel-server"
 
 service "rpcbind" do
-  provider Chef::Provider::Service::Upstart
   action [:enable, :start]
-  supports :status => true, :restart => true, :reload => true
 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 = {}
 
@@ -41,11 +38,11 @@ search(:node, "*:*") do |client|
     client.ipaddresses do |address|
       exports[mount[:path]] ||= {}
 
-      if mount[:readonly]
-        exports[mount[:path]][address] = "ro"
-      else
-        exports[mount[:path]][address] = "rw"
-      end
+      exports[mount[:path]][address] = if mount[:readonly]
+                                         "ro"
+                                       else
+                                         "rw"
+                                       end
     end
   end
 end
@@ -59,7 +56,7 @@ template "/etc/exports" do
   source "exports.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :exports => exports
   notifies :run, "execute[exportfs]"
 end