From b9d17fd242de21fb38a36dc97e9aa0dab4f7c973 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 6 Mar 2022 12:27:09 +0000 Subject: [PATCH] Drop NFS cookbook --- cookbooks/nfs/README.md | 7 --- cookbooks/nfs/attributes/default.rb | 1 - cookbooks/nfs/metadata.rb | 8 --- cookbooks/nfs/recipes/default.rb | 44 --------------- cookbooks/nfs/recipes/server.rb | 62 --------------------- cookbooks/nfs/templates/default/exports.erb | 8 --- 6 files changed, 130 deletions(-) delete mode 100644 cookbooks/nfs/README.md delete mode 100644 cookbooks/nfs/attributes/default.rb delete mode 100644 cookbooks/nfs/metadata.rb delete mode 100644 cookbooks/nfs/recipes/default.rb delete mode 100644 cookbooks/nfs/recipes/server.rb delete mode 100644 cookbooks/nfs/templates/default/exports.erb diff --git a/cookbooks/nfs/README.md b/cookbooks/nfs/README.md deleted file mode 100644 index da1c028bb..000000000 --- a/cookbooks/nfs/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# NFS Cookbook - -This cookbook configures NFS (the Network File System) which is used on -various servers. There are two recipes: - -* default: configures NFS clients based on node attributes. -* server: configures the central NFS server. diff --git a/cookbooks/nfs/attributes/default.rb b/cookbooks/nfs/attributes/default.rb deleted file mode 100644 index f3b1761a0..000000000 --- a/cookbooks/nfs/attributes/default.rb +++ /dev/null @@ -1 +0,0 @@ -default[:nfs] = {} diff --git a/cookbooks/nfs/metadata.rb b/cookbooks/nfs/metadata.rb deleted file mode 100644 index e83da596a..000000000 --- a/cookbooks/nfs/metadata.rb +++ /dev/null @@ -1,8 +0,0 @@ -name "nfs" -maintainer "OpenStreetMap Administrators" -maintainer_email "admins@openstreetmap.org" -license "Apache-2.0" -description "Installs and configures nfs" - -version "1.0.0" -supports "ubuntu" diff --git a/cookbooks/nfs/recipes/default.rb b/cookbooks/nfs/recipes/default.rb deleted file mode 100644 index 216e825f2..000000000 --- a/cookbooks/nfs/recipes/default.rb +++ /dev/null @@ -1,44 +0,0 @@ -# -# Cookbook:: nfs -# Recipe:: default -# -# 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 -# -# 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, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -package "nfs-common" - -node[:nfs].each do |mountpoint, details| - mount_options = if details[:readonly] - "ro,bg,soft,tcp,rsize=8192,wsize=8192,nfsvers=4" - else - "rw,bg,tcp,rsize=8192,wsize=8192,nfsvers=4" - end - - directory mountpoint do - owner "root" - group "root" - mode "755" - recursive true - not_if { ::File.exist?(mountpoint) } - end - - mount mountpoint do - action [:mount, :enable] - device "#{details[:host]}:#{details[:path]}" - fstype "nfs" - options mount_options - ignore_failure true - end -end diff --git a/cookbooks/nfs/recipes/server.rb b/cookbooks/nfs/recipes/server.rb deleted file mode 100644 index 93fad876c..000000000 --- a/cookbooks/nfs/recipes/server.rb +++ /dev/null @@ -1,62 +0,0 @@ -# -# Cookbook:: nfs -# Recipe:: server -# -# 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 -# -# 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, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -package "nfs-kernel-server" - -service "rpcbind" do - action [:enable, :start] -end - -service "nfs-server" do - action [:enable, :start] -end - -exports = {} - -search(:node, "*:*") do |client| - next unless client[:nfs] - - client[:nfs].each_value do |mount| - next unless mount[:host] == node[:hostname] - - client.ipaddresses do |address| - exports[mount[:path]] ||= {} - - exports[mount[:path]][address] = if mount[:readonly] - "ro" - else - "rw" - end - end - end -end - -execute "exportfs" do - action :nothing - command "/usr/sbin/exportfs -ra" -end - -template "/etc/exports" do - source "exports.erb" - owner "root" - group "root" - mode "644" - variables :exports => exports - notifies :run, "execute[exportfs]" -end diff --git a/cookbooks/nfs/templates/default/exports.erb b/cookbooks/nfs/templates/default/exports.erb deleted file mode 100644 index 7c5c2a526..000000000 --- a/cookbooks/nfs/templates/default/exports.erb +++ /dev/null @@ -1,8 +0,0 @@ -# DO NOT EDIT - This file is being maintained by Chef - -<% @exports.sort.each do |directory,clients| -%> -<% clients.sort.each do |address,options| -%> -<%= directory -%> -sync,subtree_check,<%= options %> <%= address %> -<% end -%> -<% end -%> -/store/planet -sync,subtree_check,rw 10.0.48.50 10.0.48.5 -- 2.43.2