From ef6f58a96cd9107d99ff06ad2245b493ea4eda1d Mon Sep 17 00:00:00 2001 From: Jakob Krigovsky Date: Wed, 5 Aug 2015 19:51:20 +0200 Subject: [PATCH] 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< /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