]>
Commit | Line | Data |
---|---|---|
0d005813 ER |
1 | --- chef-11.8.0/lib/chef/handler/json_file.rb~ 2013-12-21 17:25:17.000000000 +0200 |
2 | +++ chef-11.8.0/lib/chef/handler/json_file.rb 2013-12-21 17:25:58.665209433 +0200 | |
f0820095 ER |
3 | @@ -27,7 +27,7 @@ |
4 | ||
5 | def initialize(config={}) | |
6 | @config = config | |
7 | - @config[:path] ||= "/var/chef/reports" | |
8 | + @config[:path] ||= "/var/lib/chef/reports" | |
9 | @config | |
10 | end | |
11 | ||
16f49c06 ER |
12 | --- chef-12.10.24/chef-config/lib/chef-config/config.rb~ 2016-06-02 00:23:49.000000000 +0300 |
13 | +++ chef-12.10.24/chef-config/lib/chef-config/config.rb 2016-06-02 00:24:58.502867530 +0300 | |
14 | @@ -170,7 +170,7 @@ | |
15 | ||
16 | # Location of cookbooks on disk. String or array of strings. | |
17 | # Defaults to <chef_repo_path>/cookbooks. If chef_repo_path | |
18 | - # is not specified, this is set to [/var/chef/cookbooks, /var/chef/site-cookbooks]). | |
19 | + # is not specified, this is set to [/var/lib/chef/cookbooks, /var/lib/chef/site-cookbooks]). | |
20 | default(:cookbook_path) do | |
21 | if self.configuration[:chef_repo_path] | |
22 | derive_path_from_chef_repo_path("cookbooks") | |
23 | @@ -234,10 +234,10 @@ | |
24 | if local_mode | |
25 | PathHelper.join(config_dir, "local-mode-cache") | |
26 | else | |
27 | - primary_cache_root = platform_specific_path("/var") | |
28 | - primary_cache_path = platform_specific_path("/var/chef") | |
29 | - # Use /var/chef as the cache path only if that folder exists and we can read and write | |
30 | - # into it, or /var exists and we can read and write into it (we'll create /var/chef later). | |
31 | + primary_cache_root = platform_specific_path("/var/cache") | |
32 | + primary_cache_path = platform_specific_path("/var/cache/chef") | |
33 | + # Use /var/cache/chef as the cache path only if that folder exists and we can read and write | |
34 | + # into it, or /var exists and we can read and write into it (we'll create /var/cache/chef later). | |
35 | # Otherwise, we'll create .chef under the user's home directory and use that as | |
36 | # the cache path. | |
37 | unless path_accessible?(primary_cache_path) || path_accessible?(primary_cache_root) |