From ef6f58a96cd9107d99ff06ad2245b493ea4eda1d Mon Sep 17 00:00:00 2001
From: Jakob Krigovsky <jakob.krigovsky@gmail.com>
Date: Wed, 5 Aug 2015 19:51:20 +0200
Subject: [PATCH 1/4] Revert "Force install a default nginx.conf. Closes #799"

This reverts commit 129a5fd33d7ed876f753a776d212c8b1c93b7ebf.
---
 plugins/nginx-vhosts/install | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/plugins/nginx-vhosts/install b/plugins/nginx-vhosts/install
index c348c3b22..c267ceac6 100755
--- a/plugins/nginx-vhosts/install
+++ b/plugins/nginx-vhosts/install
@@ -30,37 +30,6 @@ ssl_prefer_server_ciphers on;
 EOF
 fi
 
-cat<<EOF > /etc/nginx/nginx.conf
-user www-data;
-worker_processes auto;
-pid /run/nginx.pid;
-
-events {
-  worker_connections 768;
-}
-
-http {
-  server_tokens off;
-  sendfile on;
-  tcp_nopush on;
-  tcp_nodelay on;
-  keepalive_timeout 65;
-  types_hash_max_size 2048;
-
-  include /etc/nginx/mime.types;
-  default_type application/octet-stream;
-  access_log /var/log/nginx/access.log;
-  error_log /var/log/nginx/error.log;
-
-  gzip on;
-  gzip_disable "msie6";
-
-  include /etc/nginx/conf.d/*.conf;
-  include /etc/nginx/sites-enabled/*;
-}
-
-EOF
-
 echo 'server_names_hash_bucket_size 512;' >| /etc/nginx/conf.d/server_names_hash_bucket_size.conf
 
 case "$DOKKU_DISTRO" in

From 2980731db5dec59c6fdc9c1d73d239b050a27f78 Mon Sep 17 00:00:00 2001
From: Jakob Krigovsky <jakob.krigovsky@gmail.com>
Date: Wed, 5 Aug 2015 19:59:52 +0200
Subject: [PATCH 2/4] Remove ssl_protocols directive from dokku.conf

The default nginx.conf of nginx 1.8.0 already includes this directive.
---
 plugins/nginx-vhosts/install | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/nginx-vhosts/install b/plugins/nginx-vhosts/install
index c267ceac6..f1cdbe1a5 100755
--- a/plugins/nginx-vhosts/install
+++ b/plugins/nginx-vhosts/install
@@ -22,7 +22,6 @@ ssl_session_cache shared:SSL:20m;
 ssl_session_timeout 10m;
 
 ssl_ciphers EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;
-ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
 ssl_prefer_server_ciphers on;
 
 # ssl_certificate $DOKKU_ROOT/tls/server.crt;

From 66c7f8f056f5f785648f47bcec10ee6f5a8e119b Mon Sep 17 00:00:00 2001
From: Jakob Krigovsky <jakob.krigovsky@gmail.com>
Date: Wed, 5 Aug 2015 20:24:40 +0200
Subject: [PATCH 3/4] Remove ssl_prefer_server_ciphers directive from
 dokku.conf

The default nginx.conf of nginx 1.8.0 already includes this directive.
---
 plugins/nginx-vhosts/install | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/nginx-vhosts/install b/plugins/nginx-vhosts/install
index f1cdbe1a5..465af2425 100755
--- a/plugins/nginx-vhosts/install
+++ b/plugins/nginx-vhosts/install
@@ -22,7 +22,6 @@ ssl_session_cache shared:SSL:20m;
 ssl_session_timeout 10m;
 
 ssl_ciphers EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;
-ssl_prefer_server_ciphers on;
 
 # ssl_certificate $DOKKU_ROOT/tls/server.crt;
 # ssl_certificate_key $DOKKU_ROOT/tls/server.key;

From c589e8e267e78ecd218a87ff8d62272da9a3ea91 Mon Sep 17 00:00:00 2001
From: Jakob Krigovsky <jakob.krigovsky@gmail.com>
Date: Fri, 21 Aug 2015 18:04:51 +0200
Subject: [PATCH 4/4] =?UTF-8?q?Disable=20emitting=20nginx=E2=80=99s=20vers?=
 =?UTF-8?q?ion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/nginx-vhosts/install | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/nginx-vhosts/install b/plugins/nginx-vhosts/install
index 465af2425..6eacf85c0 100755
--- a/plugins/nginx-vhosts/install
+++ b/plugins/nginx-vhosts/install
@@ -18,6 +18,8 @@ if [[ ! -f /etc/nginx/conf.d/dokku.conf ]]; then
   cat<<EOF > /etc/nginx/conf.d/dokku.conf
 include $DOKKU_ROOT/*/nginx.conf;
 
+server_tokens off;
+
 ssl_session_cache shared:SSL:20m;
 ssl_session_timeout 10m;