Merge branch 'master' of https://github.com/mitchellh/packer

command/build.go

@@ -231,7 +231,7 @@ func (c BuildCommand) Run(args []string) int {
 				fmt.Fprintf(&message, "--> %s: ", name)
 
 				if artifact != nil {
-					fmt.Fprintf(&message, artifact.String())
+					fmt.Fprint(&message, artifact.String())
 				} else {
 					fmt.Fprint(&message, "<nothing>")
 				}

communicator/ssh/communicator.go

@@ -94,7 +94,7 @@ func (c *comm) Start(cmd *packer.RemoteCmd) (err error) {
 			ssh.TTY_OP_OSPEED: 14400, // output speed = 14.4kbaud
 		}
 
-		if err = session.RequestPty("xterm", 80, 40, termModes); err != nil {
+		if err = session.RequestPty("xterm", 40, 80, termModes); err != nil {
 			return
 		}
 	}

examples/azure/centos.json

@@ -12,12 +12,12 @@
   "builders": [{
     "type": "azure-arm",
 
-    "client_id": "{{user `cid`}}",
+    "client_id": "{{user `client_id`}}",
-    "client_secret": "{{user `cst`}}",
+    "client_secret": "{{user `client_secret`}}",
-    "subscription_id": "{{user `sid`}}",
+    "resource_group_name": "{{user `resource_group`}}",
-    "tenant_id": "{{user `tid`}}",
+    "storage_account": "{{user `storage_account`}}",
-    "resource_group_name": "{{user `rgn`}}",
+    "subscription_id": "{{user `subscription_id`}}",
-    "storage_account": "{{user `sa`}}",
+    "tenant_id": "{{user `tenant_id`}}",
 
     "capture_container_name": "images",
     "capture_name_prefix": "packer",

examples/azure/debian.json

@@ -12,12 +12,12 @@
   "builders": [{
     "type": "azure-arm",
 
-    "client_id": "{{user `cid`}}",
+    "client_id": "{{user `client_id`}}",
-    "client_secret": "{{user `cst`}}",
+    "client_secret": "{{user `client_secret`}}",
-    "subscription_id": "{{user `sid`}}",
+    "resource_group_name": "{{user `resource_group`}}",
-    "tenant_id": "{{user `tid`}}",
+    "storage_account": "{{user `storage_account`}}",
-    "resource_group_name": "{{user `rgn`}}",
+    "subscription_id": "{{user `subscription_id`}}",
-    "storage_account": "{{user `sa`}}",
+    "tenant_id": "{{user `tenant_id`}}",
 
     "capture_container_name": "images",
     "capture_name_prefix": "packer",

examples/azure/opensuse.json

@@ -12,12 +12,12 @@
   "builders": [{
     "type": "azure-arm",
 
-    "client_id": "{{user `cid`}}",
+    "client_id": "{{user `client_id`}}",
-    "client_secret": "{{user `cst`}}",
+    "client_secret": "{{user `client_secret`}}",
-    "subscription_id": "{{user `sid`}}",
+    "resource_group_name": "{{user `resource_group`}}",
-    "tenant_id": "{{user `tid`}}",
+    "storage_account": "{{user `storage_account`}}",
-    "resource_group_name": "{{user `rgn`}}",
+    "subscription_id": "{{user `subscription_id`}}",
-    "storage_account": "{{user `sa`}}",
+    "tenant_id": "{{user `tenant_id`}}",
 
     "capture_container_name": "images",
     "capture_name_prefix": "packer",

website/scripts/deploy.sh

@@ -61,6 +61,18 @@ if [ -z "$NO_UPLOAD" ]; then
     --add-header="Cache-Control: max-age=31536000" \
     --add-header="x-amz-meta-surrogate-key: site-$PROJECT" \
     sync "$DIR/build/" "s3://hc-sites/$PROJECT/latest/"
+
+  # The s3cmd guessed mime type for text files is often wrong. This is
+  # problematic for some assets, so force their mime types to be correct.
+  s3cmd \
+    --mime-type="application/javascript" \
+    modify "s3://hc-sites/$PROJECT/latest/**/*.js"
+  s3cmd \
+    --mime-type="text/css" \
+    modify "s3://hc-sites/$PROJECT/latest/**/*.css"
+  s3cmd \
+    --mime-type="image/svg+xml" \
+    modify "s3://hc-sites/$PROJECT/latest/**/*.svg"
 fi
 
 # Perform a soft-purge of the surrogate key.

website/source/docs/builders/vmware-iso.html.md

@@ -84,12 +84,6 @@ builder.
 
 ### Optional:
 
--   `disk_additional_size` (array of integers) - The size(s) of any additional
-    hard disks for the VM in megabytes. If this is not specified then the VM
-    will only contain a primary hard disk. The builder uses expandable, not
-    fixed-size virtual hard disks, so the actual file representing the disk will
-    not use the full size unless it is full.
-
 -   `boot_command` (array of strings) - This is an array of commands to type
     when the virtual machine is first booted. The goal of these commands should
     be to type just enough to initialize the operating system installer. Special
@@ -103,6 +97,12 @@ builder.
     five seconds and one minute 30 seconds, respectively. If this isn't
     specified, the default is 10 seconds.
 
+-   `disk_additional_size` (array of integers) - The size(s) of any additional
+    hard disks for the VM in megabytes. If this is not specified then the VM
+    will only contain a primary hard disk. The builder uses expandable, not
+    fixed-size virtual hard disks, so the actual file representing the disk will
+    not use the full size unless it is full.
+
 -   `disk_size` (integer) - The size of the hard disk for the VM in megabytes.
     The builder uses expandable, not fixed-size virtual hard disks, so the
     actual file representing the disk will not use the full size unless it
@@ -219,12 +219,13 @@ builder.
     compacted at the end of the build process using `vmware-vdiskmanager`. In
     certain rare cases, this might actually end up making the resulting disks
     slightly larger. If you find this to be the case, you can disable compaction
-    using this configuration value.
+    using this configuration value.  Defaults to `false`.
 
 -   `keep_registered` (boolean) - Set this to `true` if you would like to keep
     the VM registered with the remote ESXi server. This is convenient if you
     use packer to provision VMs on ESXi and don't want to use ovftool to
-    deploy the resulting artifact (VMX or OVA or whatever you used as `format`)
+    deploy the resulting artifact (VMX or OVA or whatever you used as `format`).
+    Defaults to `false`.
 
 -   `tools_upload_flavor` (string) - The flavor of the VMware Tools ISO to
     upload into the VM. Valid values are "darwin", "linux", and "windows". By

website/source/docs/provisioners/chef-client.html.md

@@ -95,6 +95,10 @@ configuration is actually required.
 -   `skip_install` (boolean) - If true, Chef will not automatically be installed
     on the machine using the Chef omnibus installers.
 
+-   `ssl_verify_mode` (string) - Set to "verify\_none" to skip validation of
+    SSL certificates. If not set, this defaults to "verify\_peer" which validates
+    all SSL certifications.
+
 -   `staging_directory` (string) - This is the directory where all the
     configuration of Chef by Packer will be placed. By default this is
     "/tmp/packer-chef-client" when guest_os_type unix and