Commit abaa2753 authored by omega8cc's avatar omega8cc

Issue #1534306 by omega8cc - Duplicate directives in the Nginx config cause...

Issue #1534306 by omega8cc - Duplicate directives in the Nginx config cause issues with recommended Dotdeb Nginx build.
parent a0ad4ca2
......@@ -4,38 +4,35 @@
#
# HOW-TO:
#
# ln -s /var/aegir/config/nginx.conf /etc/nginx/conf.d/aegir.conf
# sudo /etc/init.d/nginx restart
#
# /etc/sudoers configuration:
# aegir ALL=NOPASSWD: /etc/init.d/nginx
#
# ln -s /var/aegir/config/nginx.conf /etc/nginx/conf.d/aegir.conf
# sudo /etc/init.d/nginx restart
#
user www-data;
worker_processes 4;
worker_processes 4;
worker_rlimit_nofile 8192;
error_log /var/log/nginx/error.log;
pid /var/run/nginx.pid;
error_log /var/log/nginx/error.log;
pid /var/run/nginx.pid;
events {
worker_connections 1024;
worker_connections 4096;
use epoll;
multi_accept on;
}
http {
include /etc/nginx/mime.types;
default_type application/octet-stream;
access_log /var/log/nginx/access.log;
sendfile on;
#tcp_nopush on;
#keepalive_timeout 0;
keepalive_timeout 65;
tcp_nodelay on;
gzip on;
include /etc/nginx/conf.d/*.conf;
include /etc/nginx/sites-enabled/*;
default_type application/octet-stream;
gzip on;
gzip_disable "msie6";
keepalive_timeout 65;
sendfile on;
tcp_nodelay on;
tcp_nopush on;
types_hash_max_size 8192;
include /etc/nginx/mime.types;
include /etc/nginx/conf.d/*.conf;
include /etc/nginx/sites-enabled/*;
}
......@@ -38,7 +38,6 @@
request_pool_size 4k;
server_names_hash_bucket_size 512;
server_names_hash_max_size 8192;
types_hash_max_size 8192;
types_hash_bucket_size 512;
map_hash_bucket_size 192;
fastcgi_buffer_size 128k;
......@@ -81,8 +80,7 @@
fastcgi_hide_header 'X-Powered-By';
fastcgi_hide_header 'X-Drupal-Cache';
## TCP options
tcp_nopush on;
## TCP options moved to /etc/nginx/nginx.conf
## SSL performance
ssl_session_cache shared:SSL:10m;
......@@ -96,7 +94,6 @@
gzip_types text/plain text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript;
gzip_vary on;
gzip_proxied any;
gzip_disable "MSIE [1-6]\.";
<?php
$nginx_has_gzip = drush_get_option('nginx_has_gzip');
if ($nginx_has_gzip) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment