Commit b68d8afc authored by Christopher Huhn's avatar Christopher Huhn
Browse files

Define default proxy in attribute file

parent 5be72696
......@@ -2,6 +2,7 @@ default[:cvmfs][:client][:default_local][:default_domain] = node['domain']
default[:cvmfs][:client][:default_local][:cache_base] = '/var/cache/cvmfs'
default[:cvmfs][:client][:default_local][:quota_limit] = 20000
default[:cvmfs][:client][:default_local][:max_ttl] = 30
default['cvmfs']['client']['default_local']['http_proxy'] = 'DIRECT'
default['cvmfs']['client']['domain_d'] = {}
default['cvmfs']['client']['config_d'] = {}
......@@ -36,10 +36,10 @@ when 9
include_recipe 'sys::autofs'
when 10
file '/etc/auto.master.d/cvmfs.autofs' do
content <<-EOF
# generated by Chef, cernvm-fs cookbook
/cvmfs program:/etc/auto.cvmfs
EOF
content <<EOF
# generated by Chef, cernvm-fs cookbook
/cvmfs program:/etc/auto.cvmfs
EOF
end
end
......@@ -72,9 +72,6 @@ directory node['cvmfs']['client']['default_local']['cache_base'] do
recursive true
end
# make sure CVMFS_HTTP_PROXY is defined:
node.default['cvmfs']['client']['default_local']['http_proxy'] ||= 'DIRECT'
template '/etc/cvmfs/default.local' do
source 'etc_cvmfs_default.local.erb'
mode "0644"
......
Supports Markdown
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