Combine vhosts

ansible/provision.yml

@@ -8,11 +8,7 @@
   vars:
     nginx_vhosts:
       - listen: 80
-        server_name: www.oliverdavies.uk
-        extra_parameters:
-          return 301 https://{{ server_name }}$request_uri;
-
-      - listen: 80
+        server_name_redirect: oliverdavi.es
         server_name: "{{ server_name }}"
         root: "/srv/{{ server_name }}"
         nginx_error_log: "/var/log/nginx/{{ server_name }}_error.log warn"