1 --- chef-11.14.2/lib/chef/config.rb 2014-12-04 18:09:43.557089359 +0200
2 +++ chef-11.14.2/lib/chef/config.rb 2014-12-04 18:40:15.075764026 +0200
5 # Location of cookbooks on disk. String or array of strings.
6 # Defaults to <chef_repo_path>/cookbooks. If chef_repo_path
7 - # is not specified, this is set to [/var/chef/cookbooks, /var/chef/site-cookbooks]).
8 + # is not specified, this is set to [/var/lib/chef/cookbooks, /var/lib/chef/site-cookbooks]).
9 default(:cookbook_path) do
10 if self.configuration[:chef_repo_path]
11 derive_path_from_chef_repo_path('cookbooks')
13 "#{config_dir}local-mode-cache"
15 primary_cache_root = platform_specific_path("/var")
16 - primary_cache_path = platform_specific_path("/var/chef")
17 - # Use /var/chef as the cache path only if that folder exists and we can read and write
18 - # into it, or /var exists and we can read and write into it (we'll create /var/chef later).
19 + primary_cache_path = platform_specific_path("/var/cache/chef")
20 + # Use /var/cache/chef as the cache path only if that folder exists and we can read and write
21 + # into it, or /var exists and we can read and write into it (we'll create /var/cache/chef later).
22 # Otherwise, we'll create .chef under the user's home directory and use that as
24 unless path_accessible?(primary_cache_path) || path_accessible?(primary_cache_root)
26 default(:checksum_path) { path_join(cache_path, "checksums") }
28 # Where chef's cache files should be stored
29 - default(:file_cache_path) { path_join(cache_path, "cache") }
30 + default(:file_cache_path) { cache_path }
32 # Where backups of chef-managed files should go
33 - default(:file_backup_path) { path_join(cache_path, "backup") }
34 + default(:file_backup_path) { '/var/lib/chef/backup' }
36 # The chef-client (or solo) lockfile.
38 --- chef-11.8.0/lib/chef/handler/json_file.rb~ 2013-12-21 17:25:17.000000000 +0200
39 +++ chef-11.8.0/lib/chef/handler/json_file.rb 2013-12-21 17:25:58.665209433 +0200
42 def initialize(config={})
44 - @config[:path] ||= "/var/chef/reports"
45 + @config[:path] ||= "/var/lib/chef/reports"