From 870576a45adfca642b92e7c3038ca68c2677dd41 Mon Sep 17 00:00:00 2001 From: Gonzalo Vilaseca Date: Wed, 9 Sep 2015 15:20:39 +0100 Subject: [PATCH 1/2] Fix delivery_whitelist regex --- cookbook/email/dev_environment.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cookbook/email/dev_environment.rst b/cookbook/email/dev_environment.rst index d5dbabba918..67b5e32f813 100644 --- a/cookbook/email/dev_environment.rst +++ b/cookbook/email/dev_environment.rst @@ -156,10 +156,10 @@ by adding the ``delivery_whitelist`` option: - /@specialdomain.com$/ + /@specialdomain\.com$/ - /^admin@mydomain.com$/ + /^admin@mydomain\.com$/ .. code-block:: php @@ -170,11 +170,11 @@ by adding the ``delivery_whitelist`` option: 'delivery_whitelist' => array( // all email addresses matching this regex will *not* be // redirected to dev@example.com - '/@specialdomain.com$/', + '/@specialdomain\.com$/', // all emails sent to admin@mydomain.com won't be // redirected to dev@example.com too - '/^admin@mydomain.com$/', + '/^admin@mydomain\.com$/', ), )); From 2412a8d32989f29195270b5b4235b8dbc9bc2c7b Mon Sep 17 00:00:00 2001 From: Gonzalo Vilaseca Date: Wed, 9 Sep 2015 20:20:23 +0100 Subject: [PATCH 2/2] Update dev_environment.rst --- cookbook/email/dev_environment.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook/email/dev_environment.rst b/cookbook/email/dev_environment.rst index 67b5e32f813..1bb7f069b2e 100644 --- a/cookbook/email/dev_environment.rst +++ b/cookbook/email/dev_environment.rst @@ -140,11 +140,11 @@ by adding the ``delivery_whitelist`` option: delivery_whitelist: # all email addresses matching this regex will *not* be # redirected to dev@example.com - - "/@specialdomain.com$/" + - "/@specialdomain\.com$/" # all emails sent to admin@mydomain.com won't # be redirected to dev@example.com too - - "/^admin@mydomain.com$/" + - "/^admin@mydomain\.com$/" .. code-block:: xml