From a07e641482673d936ecbc539110ab1f851118ccb Mon Sep 17 00:00:00 2001
From: Oliver Davies <opdavies@gmail.com>
Date: Wed, 18 Apr 2018 01:21:36 +0100
Subject: [PATCH] Combine vhosts

---
 ansible/provision.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ansible/provision.yml b/ansible/provision.yml
index 1720a19c..5bdf57f4 100644
--- a/ansible/provision.yml
+++ b/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"