]>
Commit | Line | Data |
---|---|---|
4d7ef64f ER |
1 | --- chef-11.8.0/lib/chef/config.rb 2013-12-21 17:24:18.980654855 +0200 |
2 | +++ chef-11.8.2/lib/chef/config.rb 2013-12-21 20:00:26.000000000 +0200 | |
0d005813 ER |
3 | @@ -162,7 +162,7 @@ |
4 | end | |
5 | end | |
6 | else | |
7 | - platform_specific_path("/var/chef") | |
8 | + platform_specific_path("/var/lib/chef") | |
9 | end | |
10 | end | |
11 | ||
4d7ef64f ER |
12 | @@ -201,7 +201,7 @@ |
13 | ||
14 | # Location of cookbooks on disk. String or array of strings. | |
15 | # Defaults to <chef_repo_path>/cookbooks. If chef_repo_path | |
16 | - # is not specified, this is set to [/var/chef/cookbooks, /var/chef/site-cookbooks]). | |
17 | + # is not specified, this is set to [/var/lib/chef/cookbooks, /var/lib/chef/site-cookbooks]). | |
18 | default(:cookbook_path) do | |
19 | if self.configuration[:chef_repo_path] | |
20 | derive_path_from_chef_repo_path('cookbooks') | |
0d005813 ER |
21 | @@ -260,7 +260,7 @@ |
22 | if local_mode | |
23 | "#{config_dir}local-mode-cache" | |
24 | else | |
25 | - platform_specific_path("/var/chef") | |
26 | + platform_specific_path("/var/cache/chef") | |
27 | end | |
28 | end | |
29 | ||
4d7ef64f ER |
30 | @@ -268,10 +268,10 @@ |
31 | default(:checksum_path) { path_join(cache_path, "checksums") } | |
0d005813 | 32 | |
4d7ef64f ER |
33 | # Where chef's cache files should be stored |
34 | - default(:file_cache_path) { path_join(cache_path, "cache") } | |
35 | + default(:file_cache_path) { cache_path } | |
36 | ||
37 | # Where backups of chef-managed files should go | |
38 | - default(:file_backup_path) { path_join(cache_path, "backup") } | |
39 | + default(:file_backup_path) { '/var/lib/chef/backup' } | |
40 | ||
41 | # The chef-client (or solo) lockfile. | |
42 | # | |
0d005813 ER |
43 | --- chef-11.8.0/lib/chef/handler/json_file.rb~ 2013-12-21 17:25:17.000000000 +0200 |
44 | +++ chef-11.8.0/lib/chef/handler/json_file.rb 2013-12-21 17:25:58.665209433 +0200 | |
f0820095 ER |
45 | @@ -27,7 +27,7 @@ |
46 | ||
47 | def initialize(config={}) | |
48 | @config = config | |
49 | - @config[:path] ||= "/var/chef/reports" | |
50 | + @config[:path] ||= "/var/lib/chef/reports" | |
51 | @config | |
52 | end | |
53 |