Herman van Rink authored May 30, 2014 and Jon Pugh committed Sep 26, 2014

Issue #2266997 by helmo, cweagans: Added Do not automatically enable update module when installing a site.

Nginx: Sanitize aliases in vhost_disabled.tpl.php to avoid: 'nginx: [warn] server name "foo.com/bar" has suspicious symbols'

Manage extra GRANTS to allow SQL remote access via SSH tunneling which depends on '127.0.0.1' and will not work with GRANTS for 'localhost'.

Kristoffer Wiklund authored Jul 25, 2014 and Herman van Rink committed Jul 25, 2014

Issue #2275467 by kristofferwiklund: Fixed incorrect variable in Debian postinstall script for Apache 2.4

Issue #2259461 by Liam McDermott - Remove too aggressive limit_conn directive in the Nginx config templates.

This reverts commit 44cead56.

Chris Moates authored Mar 07, 2014 and Christopher Gervais committed Mar 11, 2014

When the subdir module is enabled and subdirs are used, the template
that generates sites.php has a logic bug that causes it to unset()
aliases which are not subdir aliases. This patch checks each alias
before deciding whether to munge and unset it, thereby eliminating
the underlying bug.

Signed-off-by: Christopher Gervais <chris@ergonlogic.com>

Conflicts:
	debian/aegir2-provision.postinst