For my own reference really, here are the steps I took to setup an Apache vhost to redirect all non-SSL requests to https: