lib/poolparty/provision/configurations/chef.rb in auser-poolparty-1.1.4 vs lib/poolparty/provision/configurations/chef.rb in auser-poolparty-1.1.5

@@ -3,18 +3,21 @@
     
     class Chef
       def self.commands
         [
           "mkdir -p /etc/chef/cookbooks /etc/chef/cache",
-          "cp -R /var/poolparty/dr_configure/chef/recipes/* /etc/chef/cookbooks",
-          "cp /var/poolparty/dr_configure/chef_config.rb /etc/chef/solo.rb",
+          "cp -R /var/poolparty/dr_configure/chef/cookbooks/* /etc/chef/cookbooks",
+          "cp /var/poolparty/dr_configure/chef/solo.rb /etc/chef/solo.rb",
+          "cp /var/poolparty/dr_configure/chef/dna.json /etc/chef/dna.json",
           "/usr/bin/chef-solo -c /etc/chef/solo.rb -j /etc/chef/dna.json"
         ]
       end
       def self.files_to_upload
         [ 
-          "#{Default.tmp_path}/chef_config.rb",
-          "#{Default.tmp_path}/dna.json"
+          "#{Default.tmp_path}/dr_configure/chef/solo.rb",
+          "#{Default.tmp_path}/dr_configure/chef/dna.json",
+          "#{Default.base_config_directory}/chef/solo.rb",
+          "#{Default.base_config_directory}/chef/dna.json"
         ]
       end
     end
     
   end
\ No newline at end of file