From 6785b67020c662923c6213024657db4045addf9c Mon Sep 17 00:00:00 2001
From: Janette Day <janette.day@civicactions.com>
Date: Tue, 27 Mar 2018 16:14:37 -0500
Subject: [PATCH 1/3] Add Acquia-purge config for domain detection

---
 assets/sites/default/settings.acquia.php | 25 +++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/assets/sites/default/settings.acquia.php b/assets/sites/default/settings.acquia.php
index 3167b6899..5976e7d74 100644
--- a/assets/sites/default/settings.acquia.php
+++ b/assets/sites/default/settings.acquia.php
@@ -5,6 +5,29 @@
  * Acquia Settings.
  */
 
+/**
+ * Override domain detection in Acquia Purge.
+ */
+if (isset($_ENV['AH_SITE_ENVIRONMENT'])) {
+  switch ($_ENV['AH_SITE_ENVIRONMENT']) {
+    case 'prod':
+      $domain = $conf['acquia']['prod']['base_url'];
+      $domain = substr($domain, 7);
+      $conf['acquia_purge_domains'] = array($domain);
+      break;
+    case 'test':
+      $domain = $conf['acquia']['test']['base_url'];
+      $domain = substr($domain, 7);
+      $conf['acquia_purge_domains'] = array($domain);
+      break;
+    case 'dev':
+      $domain = $conf['acquia']['dev']['base_url'];
+      $domain = substr($domain, 7);
+      $conf['acquia_purge_domains'] = array($domain);
+      break;
+  }
+}
+
 if (isset($_ENV['AH_SITE_ENVIRONMENT'])) {
   if (isset($conf['memcache_servers'])) {
     $conf['cache_backends'][] = './sites/all/modules/contrib/memcache/memcache.inc';
@@ -66,7 +89,7 @@
       'api/action/datastore/search.json',
     );
   }
-  
+
   // ODSM edit forms.
   $high_memory_paths[] = 'admin/config/services/odsm/edit';
 

From d7156070cec8ad0dc58cb683bf811d6a9d53d129 Mon Sep 17 00:00:00 2001
From: Janette Day <janette.day@civicactions.com>
Date: Tue, 27 Mar 2018 16:45:18 -0500
Subject: [PATCH 2/3] Apply dkan #2405 patch

---
 dkan/test/features/group.editor.feature | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/dkan/test/features/group.editor.feature b/dkan/test/features/group.editor.feature
index e178fab83..819942186 100644
--- a/dkan/test/features/group.editor.feature
+++ b/dkan/test/features/group.editor.feature
@@ -30,9 +30,6 @@ Feature: Site Manager administer groups
       | Gabriel | Group A | administrator member | Active            |
       | Katie   | Group A | member               | Active            |
       | Jaz     | Group A | member               | Pending           |
-    And resources:
-      | title    | publisher | format | author | published | description |
-      | GER1     | Group A   | csv    | Katie  | Yes       |             |
 
   Scenario: Edit group as group administrator
     Given I am logged in as "Gabriel"
@@ -140,15 +137,21 @@ Feature: Site Manager administer groups
     Then I should see "Total members: 3"
 
   Scenario: View the number of content on group as group administrator
-    Given I am logged in as "Gabriel"
+    Given resources:
+      | title    | publisher | format | author | published | description |
+      | content2 | Group A   | csv    | Katie  | Yes       |             |
+    And I am logged in as "Gabriel"
     And I am on "Group A" page
     And I click "Group"
     When I click "People"
     Then I should see "Total content: 1"
 
   Scenario: Edit resource content created by others on group as editor
-    Given I am logged in as "Martin"
-    And I am on "GER1" page
+    Given resources:
+      | title    | publisher | format | author | published | description |
+      | content1 | Group A   | csv    | Katie  | Yes       |             |
+    And I am logged in as "Martin"
+    And I am on "content1" page
     Then I should see "Edit"
 
   Scenario: Show correct number of groups to which user belongs

From 543633db93c517023428e84f6a55403f3eb13264 Mon Sep 17 00:00:00 2001
From: Janette Day <janette.day@civicactions.com>
Date: Tue, 10 Apr 2018 11:03:54 -0500
Subject: [PATCH 3/3] Improve domain parsing

---
 assets/sites/default/settings.acquia.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/sites/default/settings.acquia.php b/assets/sites/default/settings.acquia.php
index 5976e7d74..06bfe519e 100644
--- a/assets/sites/default/settings.acquia.php
+++ b/assets/sites/default/settings.acquia.php
@@ -12,17 +12,17 @@
   switch ($_ENV['AH_SITE_ENVIRONMENT']) {
     case 'prod':
       $domain = $conf['acquia']['prod']['base_url'];
-      $domain = substr($domain, 7);
+      $domain = parse_url($domain, PHP_URL_HOST);
       $conf['acquia_purge_domains'] = array($domain);
       break;
     case 'test':
       $domain = $conf['acquia']['test']['base_url'];
-      $domain = substr($domain, 7);
+      $domain = parse_url($domain, PHP_URL_HOST);
       $conf['acquia_purge_domains'] = array($domain);
       break;
     case 'dev':
       $domain = $conf['acquia']['dev']['base_url'];
-      $domain = substr($domain, 7);
+      $domain = parse_url($domain, PHP_URL_HOST);
       $conf['acquia_purge_domains'] = array($domain);
       break;
   }