Merge branch 'master' into encore

README.md

@@ -1,4 +1,4 @@
-# oliverdavies.uk
+# oliverdavi.es
 
 Built with [Sculpin][1], styled with [Tailwind CSS][2], deployed with [Ansible][3] and [Ansistrano][4] via [Circle CI][5].
 

ansible/vars/vars.yml

@@ -1,8 +1,12 @@
 ---
-server_name: www.oliverdavies.uk
 server_name: www.oliverdavi.es
 
 nginx_vhosts:
+  - listen: 80
+    server_name: www.oliverdavies.uk
+    extra_parameters:
+        return 301 https://{{ server_name }}$request_uri;
+
   - listen: 80
     server_name: "{{ server_name }}"
     root: "/srv/{{ server_name }}/current/output_prod"

app/config/sculpin_site_prod.yml

@@ -1,7 +1,7 @@
 ---
 imports:
     - sculpin_site.yml
-url: https://www.oliverdavies.uk
-images_url: //www.oliverdavies.uk
-short_url: oliverdavies.uk
+url: https://www.oliverdavi.es
+images_url: //www.oliverdavi.es
+short_url: oliverdavi.es
 google_analytics_tracking_id: UA-11967257-1