Skip to content

Port d7 commits to master #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
perusio merged 4 commits into from
Jul 21, 2016
Merged

Port d7 commits to master #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1286294
Removed obsolete spdy_headers_comp directive.
Feb 24, 2016
e1b117e
Updated fastcgi_cache_key to use $request_method.
Feb 24, 2016
63018e1
Changed ssl_protocols to use only TLS SSL ciphers.
Feb 24, 2016
1fde747
Disabled access_log in php_fpm_status_vhost.
Feb 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/drupal/microcache_fcgi_auth.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## The cache zone referenced.
fastcgi_cache microcache;
## The cache key.
fastcgi_cache_key $cache_uid@$scheme$host$request_uri;
fastcgi_cache_key $cache_uid@$scheme$request_method$host$request_uri;

## For 200 and 301 make the cache valid for 15s.
fastcgi_cache_valid 200 301 15s;
Expand Down
8 changes: 4 additions & 4 deletions nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ http {
## for crufty clients.
ssl_ciphers ECDH+aRSA+AESGCM:ECDH+aRSA+SHA384:ECDH+aRSA+SHA256:ECDH:EDH+CAMELLIA:EDH+aRSA:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA;

## No SSL2 support. Legacy support of SSLv3.
ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
## Enable TLS only. No SSL support.
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;

## Pregenerated Diffie-Hellman parameters.
ssl_dhparam /etc/nginx/dh_param.pem;
Expand All @@ -117,8 +117,8 @@ http {
## Fill in with your own resolver.
resolver 8.8.8.8;

## Use fast header compression for SPDY.
spdy_headers_comp 1;
## Use fast header compression for SPDY in nginx versions 1.3.15-1.8.
#spdy_headers_comp 1;

## Uncomment to increase map_hash_bucket_size. If start getting
## [emerg]: could not build the map_hash, you should increase
Expand Down
6 changes: 6 additions & 0 deletions php_fpm_status_vhost.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ location = /fpm-status {
return 404;
}
fastcgi_pass www0;
access_log off;
}

## The ping page is at /ping and returns the string configured at the php-fpm level.
Expand All @@ -23,6 +24,7 @@ location = /ping {
return 404;
}
fastcgi_pass www0;
access_log off;
}

## This is for the second pool. It assumes that you've configured
Expand All @@ -37,6 +39,7 @@ location = /fpm-status-zwei {
return 404;
}
fastcgi_pass www1;
access_log off;
}

## The ping page is at /ping and returns the string configured at the php-fpm level.
Expand All @@ -46,6 +49,7 @@ location = /ping-zwei {
return 404;
}
fastcgi_pass www1;
access_log off;
}

## This is for the third pool that acts as backup. It assumes that
Expand All @@ -61,6 +65,7 @@ location = /fpm-status-drei {
return 404;
}
fastcgi_pass www2;
access_log off;
}

## The ping page is at /ping and returns the string configured at the php-fpm level.
Expand All @@ -70,4 +75,5 @@ location = /ping-drei {
return 404;
}
fastcgi_pass www2;
access_log off;
}