From 0b142d11e3e761ed6ca4b087113b575a13d6a4de Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 6 Dec 2017 21:45:13 +0000
Subject: [PATCH] Simplify Nginx config

---
 docker/nginx/conf.d/default.conf | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/docker/nginx/conf.d/default.conf b/docker/nginx/conf.d/default.conf
index a16833b9..90f3d371 100644
--- a/docker/nginx/conf.d/default.conf
+++ b/docker/nginx/conf.d/default.conf
@@ -1,27 +1,7 @@
-ssl_certificate /etc/letsencrypt/live/oliverdavies.uk/fullchain.pem;
-ssl_certificate_key /etc/letsencrypt/live/oliverdavies.uk/privkey.pem;
-
 server {
     listen 80;
-    
-    server_name http://oliverdavies.uk;
-    server_name http://www.oliverdavies.uk;
 
-    return 301 https://www.oliverdavies.uk$request_uri;
-}
-
-server {
-    listen 443 ssl;
-
-    server_name oliverdavies.uk;
-
-    return 301 https://www.oliverdavies.uk$request_uri;
-}
-
-server {
-    listen 443 ssl;
-
-    server_name www.oliverdavies.uk;
+    server_name _;
 
     root /app;
 
@@ -159,4 +139,3 @@ server {
     rewrite '^/talks/sculpin/?$' /talks/building-static-websites-sculpin permanent;
     rewrite "^/terms-and-conditions/?$" /terms permanent;
 }
-