--- chef-11.14.2/lib/chef/config.rb 2014-12-04 18:09:43.557089359 +0200 +++ chef-11.14.2/lib/chef/config.rb 2014-12-04 18:40:15.075764026 +0200 @@ -181,7 +181,7 @@ # Location of cookbooks on disk. String or array of strings. # Defaults to /cookbooks. If chef_repo_path - # is not specified, this is set to [/var/chef/cookbooks, /var/chef/site-cookbooks]). + # is not specified, this is set to [/var/lib/chef/cookbooks, /var/lib/chef/site-cookbooks]). default(:cookbook_path) do if self.configuration[:chef_repo_path] derive_path_from_chef_repo_path('cookbooks') @@ -241,9 +241,9 @@ "#{config_dir}local-mode-cache" else primary_cache_root = platform_specific_path("/var") - primary_cache_path = platform_specific_path("/var/chef") - # Use /var/chef as the cache path only if that folder exists and we can read and write - # into it, or /var exists and we can read and write into it (we'll create /var/chef later). + primary_cache_path = platform_specific_path("/var/cache/chef") + # Use /var/cache/chef as the cache path only if that folder exists and we can read and write + # into it, or /var exists and we can read and write into it (we'll create /var/cache/chef later). # Otherwise, we'll create .chef under the user's home directory and use that as # the cache path. unless path_accessible?(primary_cache_path) || path_accessible?(primary_cache_root) @@ -268,10 +268,10 @@ default(:checksum_path) { path_join(cache_path, "checksums") } # Where chef's cache files should be stored - default(:file_cache_path) { path_join(cache_path, "cache") } + default(:file_cache_path) { cache_path } # Where backups of chef-managed files should go - default(:file_backup_path) { path_join(cache_path, "backup") } + default(:file_backup_path) { '/var/lib/chef/backup' } # The chef-client (or solo) lockfile. # --- chef-11.8.0/lib/chef/handler/json_file.rb~ 2013-12-21 17:25:17.000000000 +0200 +++ chef-11.8.0/lib/chef/handler/json_file.rb 2013-12-21 17:25:58.665209433 +0200 @@ -27,7 +27,7 @@ def initialize(config={}) @config = config - @config[:path] ||= "/var/chef/reports" + @config[:path] ||= "/var/lib/chef/reports" @config end