Looks good, but I'd still like to specify defaults for these in the hiera files.

@simong I'm ok to merge this, and do you mind if I stick in defaults as I merge up my nginx multi-host PR?