Skip to content
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

Varnish/Apache issues #90

Merged
merged 5 commits into from
Dec 16, 2013
Merged

Varnish/Apache issues #90

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a3b808
Revert rollback of v0.2.38
EvanK Dec 11, 2013
f314e81
Fixed underscore cookie match in varnish vcl
EvanK Dec 11, 2013
918ab05
Forcing minimum MaxClients value of 5
EvanK Dec 16, 2013
e5b1ae5
Removed some version changes that shouldn't have been there (part of …
EvanK Dec 16, 2013
a6b9e5b
Simplified wp cookie regex (based on cookie regex we're using in prod…
EvanK Dec 16, 2013
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
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ sudo /Library/StartupItems/VirtualBox/VirtualBox restart

## Changelog

- v0.2.39 – Revert v0.2.37 (aa9e83f)
- v0.2.38 – Move events to after `deploy:update_code` ([#82](https://github.com/genesis/wordpress/pull/82))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll need to keep this line because the tag will still physically exist.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, didn't realize that came along in the revert :rage1:

- v0.2.37 – Fix isues with Varnish ([#62](https://github.com/genesis/wordpress/pull/62):
- Cleaned up cookie logic in `production.vcl` (see #28, and 3fd9d0c)
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "genesis-wordpress",
"version": "0.2.39",
"version": "0.2.33",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn't be here, since we'll be bumping versions in another commit.

"description": "Libraries for a multi-staged WordPress workflow with Vagrant",
"main": "generator/app/index.js",
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions provisioning/roles/common/templates/prefork.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
{% set _apache_max_clients = apache_settings.max_clients %}
{%- else -%}
{% set _apache_max_clients = ((ansible_memtotal_mb - _memory_system - _memory_mysql) / (_memory_php|int/2)) | round(method='ceil') | int %}
{%- if ansible_processor_vcpus > _apache_max_clients -%}
{% set _apache_max_clients = ansible_processor_vcpus %}
{%- if _apache_max_clients < 5 -%}
{% set _apache_max_clients = 5 %}
{%- endif -%}
{%- endif -%}

Expand Down
2 changes: 1 addition & 1 deletion provisioning/roles/varnish/files/etc-default-varnish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ VARNISH_STORAGE_SIZE=512M
VARNISH_SECRET_FILE=/etc/varnish/secret

# Backend storage specification
VARNISH_STORAGE="malloc,${VARNISH_STORAGE_SIZE}"
VARNISH_STORAGE="file,${VARNISH_STORAGE_FILE},${VARNISH_STORAGE_SIZE}"

# Default TTL used when the backend does not specify one
VARNISH_TTL=120
Expand Down
23 changes: 11 additions & 12 deletions provisioning/roles/varnish/files/etc-varnish/conf.d/receive/wordpress.vcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
# Pass all local or login/admin requests straight through
if (req.http.Host ~ "^local\." || (req.url ~ "wp-(login|admin)")) {
# Pass all login requests straight through
if (req.url ~ "wp-login") {
return (pass);
}

if (req.http.Cookie ~ "^wp-" || req.http.Cookie ~ "^wordpress_") {
return (pass);
# Pipe all admin requests directly
if (req.url ~ "wp-admin") {
return (pipe);
}

# Drop any cookies sent to Wordpress.
if (!(req.url ~ "wp-(login|admin)")) {
unset req.http.Cookie;
# Pass all requests containing a wp- or wordpress_ cookie
# (meaning NO caching for logged in users)
if (req.http.Cookie ~ "^([^;]+;\s*)*?(wp-|wordpress_)") {
return (pass);
}

# Anything else left?
if (!req.http.Cookie) {
unset req.http.Cookie;
}
# Drop *all* cookies sent to Wordpress, if we've gotten this far
unset req.http.Cookie;

# Try a cache-lookup
return (lookup);
37 changes: 9 additions & 28 deletions provisioning/roles/varnish/files/etc-varnish/production.vcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,28 +94,9 @@ sub vcl_recv {
#

# Some generic cookie manipulation, useful for all templates that follow
# Remove the "has_js" cookie
set req.http.Cookie = regsuball(req.http.Cookie, "has_js=[^;]+(; )?", "");

# Remove any Satallite cookies
set req.http.Cookie = regsuball(req.http.Cookie, "__gaid=[^;]+(; )?", "");
set req.http.Cookie = regsuball(req.http.Cookie, "_sdsat_[^=]+=[^;]+(; )?", "");

# Remove any Google Analytics based cookies
set req.http.Cookie = regsuball(req.http.Cookie, "__utm.=[^;]+(; )?", "");
set req.http.Cookie = regsuball(req.http.Cookie, "_ga=[^;]+(; )?", "");
set req.http.Cookie = regsuball(req.http.Cookie, "utmctr=[^;]+(; )?", "");
set req.http.Cookie = regsuball(req.http.Cookie, "utmcmd.=[^;]+(; )?", "");
set req.http.Cookie = regsuball(req.http.Cookie, "utmccn.=[^;]+(; )?", "");

# Remove any Cloudflare cookies
set req.http.Cookie = regsuball(req.http.Cookie, "__cfduid=[^;]+(; )?", "");

# Remove the Quant Capital cookies (added by some plugin, all __qca)
set req.http.Cookie = regsuball(req.http.Cookie, "__qc.=[^;]+(; )?", "");

# Remove the AddThis cookies
set req.http.Cookie = regsuball(req.http.Cookie, "__atuvc=[^;]+(; )?", "");
# Remove any '_' prefixed cookies
set req.http.Cookie = regsuball(req.http.Cookie, "(^|;\s*)_[^=]+=[^;]*", "");

# Remove a ";" prefix in the cookie if present
set req.http.Cookie = regsuball(req.http.Cookie, "^;\s*", "");
Expand Down Expand Up @@ -148,10 +129,10 @@ sub vcl_recv {
# A valid discussion could be held on this line: do you really need to cache static files that don't cause load? Only if you have memory left.
# Sure, there's disk I/O, but chances are your OS will already have these files in their buffers (thus memory).
# Before you blindly enable this, have a read here: http://mattiasgeniar.be/2012/11/28/stop-caching-static-files/
if (req.url ~ "^[^?]*\.(bmp|bz2|css|doc|eot|flv|gif|gz|ico|jpeg|jpg|js|less|mp[34]|pdf|png|rar|rtf|swf|tar|tgz|txt|wav|woff|xml|zip)(\?.*)?$") {
unset req.http.Cookie;
return (lookup);
}
# if (req.url ~ "^[^?]*\.(bmp|bz2|css|doc|eot|flv|gif|gz|ico|jpeg|jpg|js|less|mp[34]|pdf|png|rar|rtf|swf|tar|tgz|txt|wav|woff|xml|zip)(\?.*)?$") {
# unset req.http.Cookie;
# return (lookup);
# }

# Send Surrogate-Capability headers to announce ESI support to backend
set req.http.Surrogate-Capability = "key=ESI/1.0";
Expand Down Expand Up @@ -245,9 +226,9 @@ sub vcl_fetch {
# Enable cache for all static files
# The same argument as the static caches from above: monitor your cache size, if you get data nuked out of it, consider giving up the static file cache.
# Before you blindly enable this, have a read here: http://mattiasgeniar.be/2012/11/28/stop-caching-static-files/
if (req.url ~ "^[^?]*\.(bmp|bz2|css|doc|eot|flv|gif|gz|ico|jpeg|jpg|js|less|mp[34]|pdf|png|rar|rtf|swf|tar|tgz|txt|wav|woff|xml|zip)(\?.*)?$") {
unset beresp.http.set-cookie;
}
# if (req.url ~ "^[^?]*\.(bmp|bz2|css|doc|eot|flv|gif|gz|ico|jpeg|jpg|js|less|mp[34]|pdf|png|rar|rtf|swf|tar|tgz|txt|wav|woff|xml|zip)(\?.*)?$") {
# unset beresp.http.set-cookie;
# }

# Sometimes, a 301 or 302 redirect formed via Apache's mod_rewrite can mess with the HTTP port that is being passed along.
# This often happens with simple rewrite rules in a scenario where Varnish runs on :80 and Apache on :8080 on the same box.
Expand Down