Commit db69afa5 authored by Christopher Huhn's avatar Christopher Huhn 🥚
Browse files

Merge branch 'master' into upstream_packages

parents 7ef6fb59 ef692bec
*~
Berksfile.lock
.kitchen/
*~
.git
.gitlab-ci.yml
.kitchen/*
.kitchen.yml
Berksfile
Berksfile.lock
Rakefile
test
vagrant.rb
......@@ -29,22 +29,19 @@ case node['platform_version'].to_i
when 7
node.default['sys']['autofs']['maps']['cvmfs'] = {}
include_recipe 'sys::autofs'
when 9
node.default_unless['sys']['autofs']['maps']['cvmfs'] = {
mapname: '/usr/lib/cvmfs/auto.cvmfs'
}
include_recipe 'sys::autofs'
when 10
when 9,10
directory '/etc/auto.master.d'
file '/etc/auto.master.d/cvmfs.autofs' do
content <<EOF
content <<-EOF
# generated by Chef, cernvm-fs cookbook
/cvmfs program:/etc/auto.cvmfs
EOF
end
end
# Make sure the CMVFS user can use FUSE
# to mount a repositories
# Make sure the CMVFS user can use FUSE
# to mount a repositories
node.default['sys']['fuse']['config']['mount_max'] = 1000
node.default['sys']['fuse']['config']['user_allow_other'] = ''
include_recipe 'sys::fuse'
......@@ -72,6 +69,9 @@ directory node['cvmfs']['client']['default_local']['cache_base'] do
recursive true
end
# make sure CVMFS_HTTP_PROXY is defined:
node.default_unless['cvmfs']['client']['default_local']['http_proxy'] = 'DIRECT'
template '/etc/cvmfs/default.local' do
source 'etc_cvmfs_default.local.erb'
mode "0644"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment