fix FHS path of cache and backups

diff --git a/FHS.patch b/FHS.patch
index 96e5d5f5d0846166b1d13ff0ceea919572fd4708..71f219e0bf0cdf3c4ab0b92dc281afd1fb976d06 100644 (file)
--- a/FHS.patch
+++ b/FHS.patch
@@ -1,5 +1,5 @@
---- chef-11.8.0/lib/chef/config.rb~    2013-12-21 17:23:33.000000000 +0200
-+++ chef-11.8.0/lib/chef/config.rb     2013-12-21 17:24:18.980654855 +0200
+--- chef-11.8.0/lib/chef/config.rb     2013-12-21 17:24:18.980654855 +0200
++++ chef-11.8.2/lib/chef/config.rb     2013-12-21 20:00:26.000000000 +0200
 @@ -162,7 +162,7 @@
            end
          end
@@ -9,6 +9,15 @@
        end
      end
  
+@@ -201,7 +201,7 @@
+ 
+     # Location of cookbooks on disk. String or array of strings.
+     # Defaults to <chef_repo_path>/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')
 @@ -260,7 +260,7 @@
        if local_mode
          "#{config_dir}local-mode-cache"
@@ -18,17 +27,19 @@
        end
      end
  
---- chef-11.8.0/lib/chef/config.rb~    2013-12-21 17:25:17.000000000 +0200
-+++ chef-11.8.0/lib/chef/config.rb     2013-12-21 17:25:40.044358776 +0200
-@@ -201,7 +201,7 @@
+@@ -268,10 +268,10 @@
+     default(:checksum_path) { path_join(cache_path, "checksums") }
  
-     # Location of cookbooks on disk. String or array of strings.
-     # Defaults to <chef_repo_path>/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')
+     # 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 @@

diff --git a/chef.spec b/chef.spec
index 1ffe5cc2806933e670101af4cfa2fa02bc993407..a66e3ab8509d6dcc970ea77819a5ec5eabdf43fa 100644 (file)
--- a/chef.spec
+++ b/chef.spec
@@ -5,7 +5,7 @@
 Summary:       A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure
 Name:          chef
 Version:       11.8.2
-Release:       0.11
+Release:       0.12
 License:       Apache v2.0
 Group:         Development/Languages
 Source0:       http://rubygems.org/downloads/%{name}-%{version}.gem