@Vilfago It's fine to do it in the htaccess. It's even better if you
also fix all of your links in addition. It will work fine only doing it in .htaccess, but it will make apache work slightly less hard if it doesn't have to do redirects by using the https links to begin with. It's a small optimization, but an optimization nonetheless.