alt3 · bravo-kernel · Mar 23, 2015 · Mar 23, 2015
diff --git a/.cakebox/Vagrantfile.rb b/.cakebox/Vagrantfile.rb
@@ -251,19 +251,19 @@ def Cakebox.configure(config, user_settings)
       end
     end
 
-    # Install all yaml specified "additional_software" packages
-    unless settings["software"].nil?
-      settings["software"].each do |package|
+    # Install additional packages from the Ubuntu Package Archive
+    unless settings["apt_packages"].nil?
+      settings["apt_packages"].each do |package|
         config.vm.provision "shell" do |s|
           s.privileged = false
           s.inline = "bash /cakebox/console/bin/cake package add $@"
-          s.args = [ package["package"] ]
+          s.args = [package]
         end
       end
     end
 
     # Upload and run user created customization bash script (if found) to allow
-    # the user to create fully re-provisionable box customizations.
+    # the user to create fully re-provisionable box customizations
     unless settings['user_script'].nil?
       if ( settings['user_script'] =~ /^~/ )
         settings['user_script'] = settings['user_script'].sub(/^~/, Dir.home)
@@ -281,7 +281,7 @@ def Cakebox.configure(config, user_settings)
   end
 end
 
-# Hash cleaner, removes nil/empty values recursively from a hash
+# Hash cleaner, removes nil/empty values recursively from a hash.
 #
 # Very handy to avoid errors when user yaml file does not include all required parts
 # After removing nil values, it can safely be deep merged into default settings,

diff --git a/Cakebox.yaml.default b/Cakebox.yaml.default
@@ -34,6 +34,6 @@ sites:
 
 databases:
 
-software:
+apt_packages:
 
 user_script:
diff --git a/docs/sources/usage/cakebox-yaml.md b/docs/sources/usage/cakebox-yaml.md
@@ -103,9 +103,10 @@ databases:
   - name: test3.db
     options: --username user123 --password pass123
 
-software:
-  - package: whois
-  - package: phpmyadmin
+apt_packages:
+  - whois
+  - phpmyadmin
+  - dos2unix
 
 ```
 
@@ -312,7 +313,8 @@ databases:
 
 ## Additional Software
 
-Define "packages" to install addtional software from the Ubuntu Package Archive.
+Specify Ubuntu Package Archive (apt) packages in the "apt_packages" section
+so they will automatically be installed inside your box.
 
 **Please note:**
 
@@ -323,7 +325,8 @@ Option  | Description
 package | name of the software package as used by ``apt-get install``
 
 ```yaml
-additional_software:
-  - package: whois
-  - package: phpmyadmin
+apt_packages:
+  - whois
+  - phpmyadmin
+  - dos2unix
 ```