Commit 83f7c10e authored by Victor Penso's avatar Victor Penso Committed by Victor Penso
Browse files

remove proxy configuration, prepare client recipe development

parent 97813a8e
default[:cvmfs][:proxy][:access] = Hash.new
#
# Cookbook Name:: cvmfs
# Recipe:: proxy
# Recipe:: client
#
# Copyright 2013, Victor Penso
#
......@@ -17,17 +17,3 @@
# limitations under the License.
#
package 'squid3'
template '/etc/squid3/squid.conf' do
source 'etc_squid3_squid.conf.erb'
mode '0644'
variables :access => node.cvmfs.proxy.access
notifies :restart, 'service[squid3]'
end
service 'squid3' do
supports :restart => true
action :enable
end
......@@ -31,4 +31,8 @@ unless node.cvmfs.version.empty?
end
end
include_recipe 'cvmfs::server' unless node.cvmfs.server.repos.empty?
if node.cvmfs.server.repos.empty?
include_recipe 'cvmfs::client'
else
include_recipe 'cvmfs::server'
end
......@@ -25,8 +25,9 @@ apache_site '000-default' do
enable false
end
# Initialize the repositories unless they exist
node.cvmfs.server.repos.each do |repo|
execute "cvmfs_server -o root mkfs #{repo}" do
execute "cvmfs_server mkfs -o root #{repo}" do
not_if do ::File.directory? "/etc/cvmfs/repositories.d/#{repo}" end
end
end
This diff is collapsed.
name "cvmfs_client_test"
description "Use to test the [cvmfs::client] recipe."
run_list( "recipe[cvmfs]" )
default_attributes(
"cvmfs" => {
"version" => "2.1.8"
}
)
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