]> git.pld-linux.org Git - packages/chef.git/blame - FHS.patch
add sample chef.rb config
[packages/chef.git] / FHS.patch
CommitLineData
bc8e6547
ER
1Only in chef-11.4.4: .gitattributes
2Only in chef-11.4.4: .gitignore
3Only in chef-11.4.4: .rspec
4Only in chef-11.4.4: .yardopts
5Only in chef-11.4.4: Gemfile
6Only in chef-11.4.4: NOTICE
7Only in chef-11.4.4: chef.gemspec
8Only in chef-11.4.4: ci
9Only in chef-11.4.4.gem/: data.tar.gz
10Only in chef-11.4.4.gem/: distro
11diff -ur -x .svn -x .git -x .bzr -x CVS chef-11.4.4.gem/lib/chef/config.rb chef-11.4.4/lib/chef/config.rb
12--- chef-11.4.4.gem/lib/chef/config.rb 2013-04-30 01:35:11.703271336 +0300
13+++ chef-11.4.4/lib/chef/config.rb 2013-04-30 01:38:24.665295683 +0300
14@@ -141,20 +141,20 @@
15
16 # Where the cookbooks are located. Meaning is somewhat context dependent between
17 # knife, chef-client, and chef-solo.
18- cookbook_path [ platform_specific_path("/var/chef/cookbooks"),
19- platform_specific_path("/var/chef/site-cookbooks") ]
20+ cookbook_path [ platform_specific_path("/var/lib/chef/cookbooks"),
21+ platform_specific_path("/var/lib/chef/site-cookbooks") ]
22
23 # An array of paths to search for knife exec scripts if they aren't in the current directory
24 script_path []
25
26 # Where files are stored temporarily during uploads
27- sandbox_path "/var/chef/sandboxes"
28+ sandbox_path "/var/lib/chef/sandboxes"
29
30 # Where cookbook files are stored on the server (by content checksum)
31- checksum_path "/var/chef/checksums"
32+ checksum_path "/var/lib/chef/checksums"
33
34 # Where chef's cache files should be stored
35- file_cache_path platform_specific_path("/var/chef/cache")
36+ file_cache_path platform_specific_path("/var/cache/chef")
37
38 # By default, chef-client (or solo) creates a lockfile in
39 # `file_cache_path`/chef-client-running.pid
40@@ -166,7 +166,7 @@
41 lockfile nil
42
43 # Where backups of chef-managed files should go
44- file_backup_path platform_specific_path("/var/chef/backup")
45+ file_backup_path platform_specific_path("/var/lib/chef/backup")
46
47 ## Daemonization Settings ##
48 # What user should Chef run as?
49@@ -202,7 +202,7 @@
50 # toggle info level log items that can create a lot of output
51 verbose_logging true
52 node_name nil
53- node_path "/var/chef/node"
54+ node_path "/var/lib/chef/node"
55 diff_disable false
56 diff_filesize_threshold 10000000
57 diff_output_threshold 1000000
58@@ -239,9 +239,9 @@
59
60
61 # Where should chef-solo look for role files?
62- role_path platform_specific_path("/var/chef/roles")
63+ role_path platform_specific_path("/var/lib/chef/roles")
64
65- data_bag_path platform_specific_path("/var/chef/data_bags")
66+ data_bag_path platform_specific_path("/var/lib/chef/data_bags")
67
68 # Where should chef-solo download recipes from?
69 recipe_url nil
70@@ -286,8 +286,8 @@
71 # Server Signing CA
72 #
73 # In truth, these don't even have to change
74- signing_ca_cert "/var/chef/ca/cert.pem"
75- signing_ca_key "/var/chef/ca/key.pem"
76+ signing_ca_cert "/var/lib/chef/ca/cert.pem"
77+ signing_ca_key "/var/lib/chef/ca/key.pem"
78 signing_ca_user nil
79 signing_ca_group nil
80 signing_ca_country "US"
81@@ -318,7 +318,7 @@
82 syntax_check_cache_path nil
83
84 # Deprecated:
85- cache_options({ :path => platform_specific_path("/var/chef/cache/checksums") })
86+ cache_options({ :path => platform_specific_path("/var/cache/chef/checksums") })
87
88 # Set to false to silence Chef 11 deprecation warnings:
89 chef11_deprecation_warnings true
90diff -ur -x .svn -x .git -x .bzr -x CVS chef-11.4.4.gem/lib/chef/handler/json_file.rb chef-11.4.4/lib/chef/handler/json_file.rb
91--- chef-11.4.4.gem/lib/chef/handler/json_file.rb 2013-04-30 01:35:11.709938303 +0300
92+++ chef-11.4.4/lib/chef/handler/json_file.rb 2013-04-30 01:38:24.665295683 +0300
93@@ -27,7 +27,7 @@
94
95 def initialize(config={})
96 @config = config
97- @config[:path] ||= "/var/chef/reports"
98+ @config[:path] ||= "/var/lib/chef/reports"
99 @config
100 end
101
102Only in chef-11.4.4.gem/: metadata.gz
103Only in chef-11.4.4.gem/: spec
This page took 0.077322 seconds and 4 git commands to generate.