FHS.patch

   1 --- chef-11.4.4.gem/lib/chef/handler/json_file.rb       2013-04-30 01:35:11.709938303 +0300
   2 +++ chef-11.4.4/lib/chef/handler/json_file.rb   2013-04-30 01:38:24.665295683 +0300
   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
  12 --- chef-11.6.0/lib/chef/config.rb~     2013-08-18 18:27:57.000000000 +0300
  13 +++ chef-11.6.0/lib/chef/config.rb      2013-08-18 18:28:08.057227738 +0300
  14 @@ -123,17 +123,17 @@
  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 cookbook files are stored on the server (by content checksum)
  27 -    checksum_path "/var/chef/checksums"
  28 +    checksum_path "/var/lib/chef/checksums"
  29
  30      # Where chef's cache files should be stored
  31 -    file_cache_path platform_specific_path("/var/chef/cache")
  32 +    file_cache_path platform_specific_path("/var/cache/chef")
  33
  34      # By default, chef-client (or solo) creates a lockfile in
  35      # `file_cache_path`/chef-client-running.pid
  36 @@ -145,7 +145,7 @@
  37      lockfile nil
  38
  39      # Where backups of chef-managed files should go
  40 -    file_backup_path platform_specific_path("/var/chef/backup")
  41 +    file_backup_path platform_specific_path("/var/lib/chef")
  42
  43      ## Daemonization Settings ##
  44      # What user should Chef run as?
  45 @@ -207,11 +207,11 @@
  46      ssl_ca_file nil
  47
  48      # Where should chef-solo look for role files?
  49 -    role_path platform_specific_path("/var/chef/roles")
  50 +    role_path platform_specific_path("/var/lib/chef/roles")
  51
  52 -    data_bag_path platform_specific_path("/var/chef/data_bags")
  53 +    data_bag_path platform_specific_path("/var/lib/chef/data_bags")
  54
  55 -    environment_path platform_specific_path("/var/chef/environments")
  56 +    environment_path platform_specific_path("/var/lib/chef/environments")
  57
  58      # Where should chef-solo download recipes from?
  59      recipe_url nil
  60 @@ -302,7 +302,7 @@
  61      syntax_check_cache_path nil
  62
  63      # Deprecated:
  64 -    cache_options({ :path => platform_specific_path("/var/chef/cache/checksums") })
  65 +    cache_options({ :path => platform_specific_path("/var/cache/chef/checksums") })
  66
  67      # Set to false to silence Chef 11 deprecation warnings:
  68      chef11_deprecation_warnings true
  69 --- chef-11.6.0/lib/chef/chef_fs/config.rb~     2013-08-18 18:28:38.000000000 +0300
  70 +++ chef-11.6.0/lib/chef/chef_fs/config.rb      2013-08-18 18:29:11.806714479 +0300
  71 @@ -158,17 +158,17 @@
  72
  73        def configure_repo_paths
  74          # Smooth out some (for now) inappropriate defaults set by Chef
  75 -        if @chef_config[:cookbook_path] == [ @chef_config.platform_specific_path("/var/chef/cookbooks"),
  76 -                      @chef_config.platform_specific_path("/var/chef/site-cookbooks") ]
  77 +        if @chef_config[:cookbook_path] == [ @chef_config.platform_specific_path("/var/lib/chef/cookbooks"),
  78 +                      @chef_config.platform_specific_path("/var/lib/chef/site-cookbooks") ]
  79            @chef_config[:cookbook_path] = nil
  80          end
  81 -        if @chef_config[:data_bag_path] == @chef_config.platform_specific_path('/var/chef/data_bags')
  82 +        if @chef_config[:data_bag_path] == @chef_config.platform_specific_path('/var/lib/chef/data_bags')
  83            @chef_config[:data_bag_path] = nil
  84          end
  85 -        if @chef_config[:node_path] == '/var/chef/node'
  86 +        if @chef_config[:node_path] == '/var/lib/chef/node'
  87            @chef_config[:node_path] = nil
  88          end
  89 -        if @chef_config[:role_path] == @chef_config.platform_specific_path('/var/chef/roles')
  90 +        if @chef_config[:role_path] == @chef_config.platform_specific_path('/var/lib/chef/roles')
  91            @chef_config[:role_path] = nil
  92          end
  93