From ba13e8bb5dce7fae318fa66e2513ba59bd9da4a4 Mon Sep 17 00:00:00 2001
From: mko <code@m-ko-x.de>
Date: Tue, 10 Feb 2015 22:52:04 +0100
Subject: [PATCH] added rewrite for 'www'-prefixed requests

---
 README.md  |  8 ++++++++
 nginx.tmpl | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/README.md b/README.md
index d80e828..61fc8e6 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,13 @@
 ![nginx 1.7.8](https://img.shields.io/badge/nginx-1.7.8-brightgreen.svg) ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg)
 
+##Modifications
+
+To make Jason's nginx-proxy work for me, I changed:
+
+- added rewrite of 'www'-prefixed domains to 301 without prefix for both https and http protocol
+
+##Original 
+
 nginx-proxy sets up a container running nginx and [docker-gen][1].  docker-gen generates reverse proxy configs for nginx and reloads nginx when containers are started and stopped.
 
 See [Automated Nginx Reverse Proxy for Docker][2] for why you might want to use this.
diff --git a/nginx.tmpl b/nginx.tmpl
index d373ce3..d473290 100644
--- a/nginx.tmpl
+++ b/nginx.tmpl
@@ -83,6 +83,11 @@ upstream {{ $host }} {
 
 {{ if (and (ne $cert "") (exists (printf "/etc/nginx/certs/%s.crt" $cert)) (exists (printf "/etc/nginx/certs/%s.key" $cert))) }}
 
+server {
+    server_name  www.{{ $host }};
+    rewrite ^(.*) https://{{ $host }}$1 permanent;
+}
+
 server {
 	server_name {{ $host }};
 	rewrite ^(.*) https://{{ $host }}$1 permanent;
@@ -114,6 +119,11 @@ server {
 }
 {{ else }}
 
+server {
+    server_name  www.{{ $host }};
+    rewrite ^(.*) http://{{ $host }}$1 permanent;
+}
+
 server {
 	server_name {{ $host }};