From 9510edb0b5c35fd12c0c77130b944e79519dbde8 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Mon, 25 Sep 2023 11:23:11 -0500
Subject: [PATCH 01/27] v2.9.9-twdh-0.4.1.rc1 prep

updated plugin tags for v2.9.9-twdh-0.4.1.rc1
added ckanext-twdh_gazetteer to plugins list
---
 docker/ckan/plugins/ckan_plugins.json | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/docker/ckan/plugins/ckan_plugins.json b/docker/ckan/plugins/ckan_plugins.json
index 7438c95..24725a0 100644
--- a/docker/ckan/plugins/ckan_plugins.json
+++ b/docker/ckan/plugins/ckan_plugins.json
@@ -3,7 +3,7 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-twdh_theme",
-      "tag": "TWDH-0.4.0.rc1",
+      "tag": "TWDH-0.4.1.rc1",
       "branch": "",
       "cmd": [
         "pip install -e .",
@@ -14,8 +14,15 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-twdh_schema",
-      "tag": "TWDHv0.3.2-20230809",
-      "branch": "main",
+      "tag": "TWDHv0.4.1.rc1",
+      "branch": "",
+      "cmd": ["pip install -e .", "pip install -r requirements.txt"]
+    },
+    {
+      "owner": "TNRIS",
+      "repo": "ckanext-twdh_gazetteer",
+      "tag": "TWDH-0.4.1.rc1",
+      "branch": "",
       "cmd": ["pip install -e .", "pip install -r requirements.txt"]
     },
     {

From 94b439c9826ccc0198076b91b1845438cded2134 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Mon, 25 Sep 2023 11:23:11 -0500
Subject: [PATCH 02/27] v2.9.9-twdh-0.4.1.rc1 prep

updated plugin tags for v2.9.9-twdh-0.4.1.rc1
added ckanext-twdh_gazetteer to plugins list
---
 docker/ckan/plugins/ckan_plugins.json | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/docker/ckan/plugins/ckan_plugins.json b/docker/ckan/plugins/ckan_plugins.json
index 1e7d3e6..82f58fd 100644
--- a/docker/ckan/plugins/ckan_plugins.json
+++ b/docker/ckan/plugins/ckan_plugins.json
@@ -3,7 +3,7 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-twdh_theme",
-      "tag": "TWDHv0.4.0.rc11",
+      "tag": "TWDH-0.4.1.rc1",
       "branch": "",
       "cmd": [
         "pip install -e .",
@@ -14,8 +14,15 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-twdh_schema",
-      "tag": "TWDHv0.3.2-20230809",
-      "branch": "main",
+      "tag": "TWDHv0.4.1.rc1",
+      "branch": "",
+      "cmd": ["pip install -e .", "pip install -r requirements.txt"]
+    },
+    {
+      "owner": "TNRIS",
+      "repo": "ckanext-twdh_gazetteer",
+      "tag": "TWDH-0.4.1.rc1",
+      "branch": "",
       "cmd": ["pip install -e .", "pip install -r requirements.txt"]
     },
     {

From 2a13083bb4b7f7aa3145c1f724e7f98c49321f3b Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Mon, 25 Sep 2023 11:48:05 -0500
Subject: [PATCH 03/27] corrected tag names

---
 docker/ckan/plugins/ckan_plugins.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/ckan/plugins/ckan_plugins.json b/docker/ckan/plugins/ckan_plugins.json
index 82f58fd..d31f0f0 100644
--- a/docker/ckan/plugins/ckan_plugins.json
+++ b/docker/ckan/plugins/ckan_plugins.json
@@ -3,7 +3,7 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-twdh_theme",
-      "tag": "TWDH-0.4.1.rc1",
+      "tag": "TWDHv0.4.1.rc1",
       "branch": "",
       "cmd": [
         "pip install -e .",
@@ -21,7 +21,7 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-twdh_gazetteer",
-      "tag": "TWDH-0.4.1.rc1",
+      "tag": "TWDHv0.4.1.rc2",
       "branch": "",
       "cmd": ["pip install -e .", "pip install -r requirements.txt"]
     },

From ea57eeb647bf3a3938d11d230644e1b5bbfa9170 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Mon, 25 Sep 2023 14:47:37 -0500
Subject: [PATCH 04/27] Updated tag and cmd for ckanext-twdh_gazetteer

---
 docker/ckan/plugins/ckan_plugins.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/ckan/plugins/ckan_plugins.json b/docker/ckan/plugins/ckan_plugins.json
index d31f0f0..0c77c24 100644
--- a/docker/ckan/plugins/ckan_plugins.json
+++ b/docker/ckan/plugins/ckan_plugins.json
@@ -21,9 +21,9 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-twdh_gazetteer",
-      "tag": "TWDHv0.4.1.rc2",
+      "tag": "TWDHv0.4.1.rc3",
       "branch": "",
-      "cmd": ["pip install -e .", "pip install -r requirements.txt"]
+      "cmd": ["pip install -r requirements.txt", "python setup.py develop"]
     },
     {
       "owner": "TNRIS",

From aebae673508e4ffeb1f8de0f3eb9fc5934464f50 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Mon, 25 Sep 2023 15:41:27 -0500
Subject: [PATCH 05/27] Attempted something different on twdh_gazetteer install
 command

---
 docker/ckan/plugins/ckan_plugins.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/ckan/plugins/ckan_plugins.json b/docker/ckan/plugins/ckan_plugins.json
index 0c77c24..7385f91 100644
--- a/docker/ckan/plugins/ckan_plugins.json
+++ b/docker/ckan/plugins/ckan_plugins.json
@@ -23,7 +23,7 @@
       "repo": "ckanext-twdh_gazetteer",
       "tag": "TWDHv0.4.1.rc3",
       "branch": "",
-      "cmd": ["pip install -r requirements.txt", "python setup.py develop"]
+      "cmd": ["python setup.py install"]
     },
     {
       "owner": "TNRIS",

From b24042033c31e848096975293de25f183c133102 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Mon, 25 Sep 2023 16:14:20 -0500
Subject: [PATCH 06/27] Added twdh_gazetteer to docker/ckan/Dockerfile

---
 docker/ckan/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index c49832a..a95d6ac 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -149,7 +149,8 @@ ENV CKAN__PLUGINS \
     #googleanalytics \
     s3filestore \
     envvars \ 
-    ags_fs_view
+    ags_fs_view \ 
+    twdh_gazetteer
     
 # s3filestore env variables
 ENV CKANEXT__S3FILESTORE__AWS_BUCKET_NAME twdh-s3filestore

From e7d7e9864365eafbdd080b630abe1f6a49fb79c0 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Mon, 25 Sep 2023 16:37:06 -0500
Subject: [PATCH 07/27] Changed install cmd to "pip install -e ." for
 twdh_gazetteer

---
 docker/ckan/plugins/ckan_plugins.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/ckan/plugins/ckan_plugins.json b/docker/ckan/plugins/ckan_plugins.json
index 7385f91..47ac7ad 100644
--- a/docker/ckan/plugins/ckan_plugins.json
+++ b/docker/ckan/plugins/ckan_plugins.json
@@ -23,7 +23,7 @@
       "repo": "ckanext-twdh_gazetteer",
       "tag": "TWDHv0.4.1.rc3",
       "branch": "",
-      "cmd": ["python setup.py install"]
+      "cmd": ["pip install -e ."]
     },
     {
       "owner": "TNRIS",

From 6a4a5fb6275d9f2f538f7bdfcd3ba41b095961a7 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Thu, 5 Oct 2023 12:53:50 -0500
Subject: [PATCH 08/27] dev-focused updates

WIP turned ckanext-googleanalytics back on
Updated tags on plugin list to use bb-dev branch as appropriate
---
 docker/ckan/Dockerfile                | 15 +++++++++++++--
 docker/ckan/plugins/ckan_plugins.json | 16 ++++++++--------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index a95d6ac..37f8ec6 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -146,7 +146,7 @@ ENV CKAN__PLUGINS \
     datatablesview_plus \
     datapusher \
     openapi_viewer \
-    #googleanalytics \
+    googleanalytics \
     s3filestore \
     envvars \ 
     ags_fs_view \ 
@@ -258,8 +258,19 @@ RUN ckan config-tool ${APP_DIR}/production.ini "ckan.plugins = ${CKAN__PLUGINS}"
     ckan config-tool ${APP_DIR}/production.ini "ckanext.spatial.search_backend = solr" && \
     # change default logo to tx water logo from cdn.tnris.org
     ckan config-tool ${APP_DIR}/production.ini "ckan.site_logo = https://cdn.tnris.org/images/Hub_NavIcon_dark.png" && \
+
+    # It would be nice to move this into the helm templates so that we can set different codes on different deployments
     # add config option for google analytics download view
-    ckan config-tool ${APP_DIR}/production.ini "googleanalytics.id = UA-491601-18" && \
+
+    # deprecated GA3 UA code
+    #ckan config-tool ${APP_DIR}/production.ini "googleanalytics.id = UA-491601-18" && \
+
+    # PROD TWDH GA4 account code
+    #ckan config-tool ${APP_DIR}/production.ini "googleanalytics.id = G-SJK5R9G5F5" && \
+
+    # TESTING TWDH GA4 account code
+    ckan config-tool ${APP_DIR}/production.ini "googleanalytics.id = G-CYTPM5673B" && \
+
     ckan config-tool ${APP_DIR}/production.ini "googleanalytics.download_handler = ckanext.s3filestore.views:resource_download" && \
     # Change ownership to app user
     chown -R ckan:ckan /srv/app
diff --git a/docker/ckan/plugins/ckan_plugins.json b/docker/ckan/plugins/ckan_plugins.json
index 47ac7ad..f40f30c 100644
--- a/docker/ckan/plugins/ckan_plugins.json
+++ b/docker/ckan/plugins/ckan_plugins.json
@@ -3,8 +3,8 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-twdh_theme",
-      "tag": "TWDHv0.4.1.rc1",
-      "branch": "",
+      "tag": "",
+      "branch": "bb-dev",
       "cmd": [
         "pip install -e .",
         "pip install -r requirements.txt",
@@ -14,8 +14,8 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-twdh_schema",
-      "tag": "TWDHv0.4.1.rc1",
-      "branch": "",
+      "tag": "",
+      "branch": "bb-dev",
       "cmd": ["pip install -e .", "pip install -r requirements.txt"]
     },
     {
@@ -88,8 +88,8 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-datatablesview_plus",
-      "tag": "TWDHv0.4.0.rc1",
-      "branch": "",
+      "tag": "",
+      "branch": "bb-dev",
       "cmd": [
         "python setup.py install",
         "pip install botocore==1.27.29",
@@ -97,10 +97,10 @@
       ]
     },
     {
-      "owner": "keitaroinc",
+      "owner": "TNRIS",
       "repo": "ckanext-googleanalytics",
       "tag": "",
-      "branch": "master",
+      "branch": "bb-dev",
       "cmd": ["python setup.py install", "pip install -r requirements.txt"]
     },
     {

From b4492a82bad7919c96270bc5c126dfd270ce5627 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Mon, 23 Oct 2023 16:01:04 -0500
Subject: [PATCH 09/27] bb-dev deployment updates

* Changed tags in docker/ckan/plugins/ckan.plugins.json
* Commented out googleanalytics.id settings in docker/ckan/Dockerfile
---
 docker/ckan/Dockerfile                | 5 +++--
 docker/ckan/plugins/ckan_plugins.json | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index 37f8ec6..938328d 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -269,9 +269,10 @@ RUN ckan config-tool ${APP_DIR}/production.ini "ckan.plugins = ${CKAN__PLUGINS}"
     #ckan config-tool ${APP_DIR}/production.ini "googleanalytics.id = G-SJK5R9G5F5" && \
 
     # TESTING TWDH GA4 account code
-    ckan config-tool ${APP_DIR}/production.ini "googleanalytics.id = G-CYTPM5673B" && \
+    #ckan config-tool ${APP_DIR}/production.ini "googleanalytics.id = G-CYTPM5673B" && \
+
+    #ckan config-tool ${APP_DIR}/production.ini "googleanalytics.download_handler = ckanext.s3filestore.views:resource_download" && \
 
-    ckan config-tool ${APP_DIR}/production.ini "googleanalytics.download_handler = ckanext.s3filestore.views:resource_download" && \
     # Change ownership to app user
     chown -R ckan:ckan /srv/app
 
diff --git a/docker/ckan/plugins/ckan_plugins.json b/docker/ckan/plugins/ckan_plugins.json
index f40f30c..a020f5b 100644
--- a/docker/ckan/plugins/ckan_plugins.json
+++ b/docker/ckan/plugins/ckan_plugins.json
@@ -15,7 +15,7 @@
       "owner": "TNRIS",
       "repo": "ckanext-twdh_schema",
       "tag": "",
-      "branch": "bb-dev",
+      "branch": "bb-dev-scheming-3.0",
       "cmd": ["pip install -e .", "pip install -r requirements.txt"]
     },
     {
@@ -28,8 +28,8 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-spatial",
-      "tag": "v1.1.0",
-      "branch": "",
+      "tag": "",
+      "branch": "bb-dev",
       "cmd": [
         "pip install -e .",
         "pip install -r requirements.txt",

From 7aa89ba7a024d555b94273d2aa9d485e7af16695 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Mon, 23 Oct 2023 16:23:56 -0500
Subject: [PATCH 10/27] Switched ckanext-scheming to use ckan master version

---
 docker/ckan/plugins/ckan_plugins.json | 4 ++--
 docker/docker-compose.yml             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/ckan/plugins/ckan_plugins.json b/docker/ckan/plugins/ckan_plugins.json
index a020f5b..d0260b5 100644
--- a/docker/ckan/plugins/ckan_plugins.json
+++ b/docker/ckan/plugins/ckan_plugins.json
@@ -44,9 +44,9 @@
       "cmd": ["python setup.py install"]
     },
     {
-      "owner": "TNRIS",
+      "owner": "ckan",
       "repo": "ckanext-scheming",
-      "tag": "TWDHv0.2.6",
+      "tag": "",
       "branch": "master",
       "cmd": ["pip install -e ."]
     },
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index ab339a4..f433d99 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -9,7 +9,7 @@ services:
   ckan:
     container_name: ckan
     hostname: ckan
-    image: 746466009731.dkr.ecr.us-east-1.amazonaws.com/29_ckan:v2.9.9-twdh-0.4.0.rc1
+    image: 746466009731.dkr.ecr.us-east-1.amazonaws.com/29_ckan:v2.9.9-dev-twdh-0.4.2.20231023
     networks:
       - frontend
       - backend

From 1c0f195acace3402c039fe11961009373de40ddc Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Mon, 23 Oct 2023 16:44:20 -0500
Subject: [PATCH 11/27] Removed commented out googleanalytics.id settings in
 Dockerfile

---
 docker/ckan/Dockerfile | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index 938328d..a1d868c 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -259,20 +259,6 @@ RUN ckan config-tool ${APP_DIR}/production.ini "ckan.plugins = ${CKAN__PLUGINS}"
     # change default logo to tx water logo from cdn.tnris.org
     ckan config-tool ${APP_DIR}/production.ini "ckan.site_logo = https://cdn.tnris.org/images/Hub_NavIcon_dark.png" && \
 
-    # It would be nice to move this into the helm templates so that we can set different codes on different deployments
-    # add config option for google analytics download view
-
-    # deprecated GA3 UA code
-    #ckan config-tool ${APP_DIR}/production.ini "googleanalytics.id = UA-491601-18" && \
-
-    # PROD TWDH GA4 account code
-    #ckan config-tool ${APP_DIR}/production.ini "googleanalytics.id = G-SJK5R9G5F5" && \
-
-    # TESTING TWDH GA4 account code
-    #ckan config-tool ${APP_DIR}/production.ini "googleanalytics.id = G-CYTPM5673B" && \
-
-    #ckan config-tool ${APP_DIR}/production.ini "googleanalytics.download_handler = ckanext.s3filestore.views:resource_download" && \
-
     # Change ownership to app user
     chown -R ckan:ckan /srv/app
 

From df7d27b2591e93d0a55db702a3b835eafd7b84b1 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Mon, 23 Oct 2023 17:03:07 -0500
Subject: [PATCH 12/27] Removed extraneous empty line in Dockerfile RUN
 statement

---
 docker/ckan/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index a1d868c..0f0769b 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -258,7 +258,6 @@ RUN ckan config-tool ${APP_DIR}/production.ini "ckan.plugins = ${CKAN__PLUGINS}"
     ckan config-tool ${APP_DIR}/production.ini "ckanext.spatial.search_backend = solr" && \
     # change default logo to tx water logo from cdn.tnris.org
     ckan config-tool ${APP_DIR}/production.ini "ckan.site_logo = https://cdn.tnris.org/images/Hub_NavIcon_dark.png" && \
-
     # Change ownership to app user
     chown -R ckan:ckan /srv/app
 

From abc52635a7181bc3da57f9a7a3857a44c89b4a7b Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Mon, 30 Oct 2023 15:43:16 -0500
Subject: [PATCH 13/27] WIP Google Analytics testing

* Reenabled google variables
* Moved envvars to the end of CKAN__PLUGINS and added comment to remind
that this needs to be the last in the list of plugins
---
 docker/ckan/Dockerfile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index 0f0769b..d423728 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -148,10 +148,11 @@ ENV CKAN__PLUGINS \
     openapi_viewer \
     googleanalytics \
     s3filestore \
-    envvars \ 
     ags_fs_view \ 
-    twdh_gazetteer
-    
+    twdh_gazetteer \
+    envvars 
+    # ^ envvars always needs to be last in the CKAN__PLUGINS list
+
 # s3filestore env variables
 ENV CKANEXT__S3FILESTORE__AWS_BUCKET_NAME twdh-s3filestore
 ENV CKANEXT__S3FILESTORE__SIGNATURE_VERSION s3v4
@@ -258,6 +259,9 @@ RUN ckan config-tool ${APP_DIR}/production.ini "ckan.plugins = ${CKAN__PLUGINS}"
     ckan config-tool ${APP_DIR}/production.ini "ckanext.spatial.search_backend = solr" && \
     # change default logo to tx water logo from cdn.tnris.org
     ckan config-tool ${APP_DIR}/production.ini "ckan.site_logo = https://cdn.tnris.org/images/Hub_NavIcon_dark.png" && \
+    # add config option for google analytics download view
+    ckan config-tool ${APP_DIR}/production.ini "googleanalytics.id = UA-491601-18" && \
+    ckan config-tool ${APP_DIR}/production.ini "googleanalytics.download_handler = ckanext.s3filestore.views:resource_download" && \
     # Change ownership to app user
     chown -R ckan:ckan /srv/app
 

From 59f6386ce2eac518083bed6c9fb9f539c33a257b Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Wed, 1 Nov 2023 16:08:02 -0500
Subject: [PATCH 14/27] TEMPORARILY changed GA code to G-CYTPM5673B

---
 docker/ckan/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index d423728..6ba60d8 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -82,7 +82,7 @@ FROM ubuntu:focal-20210827
 
 ARG GH_TOKEN=default
 
-LABEL maintainer="Texas Natural Resources Information Systems"
+LABEL maintainer="Texas Geographic Information Office"
 LABEL org.opencontainers.image.source https://github.com/tnris/twdh_ckan_docker
 
 # Set timezone
@@ -260,7 +260,7 @@ RUN ckan config-tool ${APP_DIR}/production.ini "ckan.plugins = ${CKAN__PLUGINS}"
     # change default logo to tx water logo from cdn.tnris.org
     ckan config-tool ${APP_DIR}/production.ini "ckan.site_logo = https://cdn.tnris.org/images/Hub_NavIcon_dark.png" && \
     # add config option for google analytics download view
-    ckan config-tool ${APP_DIR}/production.ini "googleanalytics.id = UA-491601-18" && \
+    ckan config-tool ${APP_DIR}/production.ini "googleanalytics.id = G-CYTPM5673B" && \
     ckan config-tool ${APP_DIR}/production.ini "googleanalytics.download_handler = ckanext.s3filestore.views:resource_download" && \
     # Change ownership to app user
     chown -R ckan:ckan /srv/app

From f63feffb7ca16320229dedf4b20085a9a0c69521 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Thu, 2 Nov 2023 12:03:59 -0500
Subject: [PATCH 15/27] set ckanext.spatial.search_backend = solr-bbox in
 Dockerfile

---
 docker/ckan/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index 6ba60d8..86271f9 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -256,7 +256,7 @@ RUN ckan config-tool ${APP_DIR}/production.ini "ckan.plugins = ${CKAN__PLUGINS}"
     ckan config-tool ${APP_DIR}/production.ini "scheming.organization_schemas = ckanext.twdh_schema:schemas/organization.yaml" && \
     ckan config-tool ${APP_DIR}/production.ini "scheming.presets = ckanext.scheming:presets.json ckanext.composite:presets.json ckanext.twdh_schema:schemas/presets.yaml" && \
     # add ckan.spatial.search_backend to enable solr spatial search
-    ckan config-tool ${APP_DIR}/production.ini "ckanext.spatial.search_backend = solr" && \
+    ckan config-tool ${APP_DIR}/production.ini "ckanext.spatial.search_backend = solr-bbox" && \
     # change default logo to tx water logo from cdn.tnris.org
     ckan config-tool ${APP_DIR}/production.ini "ckan.site_logo = https://cdn.tnris.org/images/Hub_NavIcon_dark.png" && \
     # add config option for google analytics download view

From 8b00e95155811197afffbd0a0f12eee751740495 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Tue, 7 Nov 2023 15:57:14 -0600
Subject: [PATCH 16/27] Added "-b 65535" to UWSGI_OPTS; Updated tag on
 ckanext-twdh_schema

---
 docker/ckan/plugins/ckan_plugins.json | 6 +++---
 docker/ckan/setup/app/start_ckan.sh   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/ckan/plugins/ckan_plugins.json b/docker/ckan/plugins/ckan_plugins.json
index d0260b5..65baac4 100644
--- a/docker/ckan/plugins/ckan_plugins.json
+++ b/docker/ckan/plugins/ckan_plugins.json
@@ -15,7 +15,7 @@
       "owner": "TNRIS",
       "repo": "ckanext-twdh_schema",
       "tag": "",
-      "branch": "bb-dev-scheming-3.0",
+      "branch": "bb-dev",
       "cmd": ["pip install -e .", "pip install -r requirements.txt"]
     },
     {
@@ -127,8 +127,8 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-check-link",
-      "tag": "TWDHv0.4.0.rc1",
-      "branch": "",
+      "tag": "",
+      "branch": "bb-dev",
       "cmd": ["python setup.py install", "pip install -r dev-requirements.txt"]
     },
     {
diff --git a/docker/ckan/setup/app/start_ckan.sh b/docker/ckan/setup/app/start_ckan.sh
index fee6dad..c246079 100755
--- a/docker/ckan/setup/app/start_ckan.sh
+++ b/docker/ckan/setup/app/start_ckan.sh
@@ -13,7 +13,7 @@ then
 fi
 
 # Set the common uwsgi options
-UWSGI_OPTS="--socket /tmp/uwsgi.sock --uid ckan --gid ckan --http :5000 --master --enable-threads --wsgi-file /srv/app/wsgi.py --module wsgi:application --lazy-apps --gevent 2000 -p 2 -L --gevent-early-monkey-patch --vacuum --harakiri 50 --callable application"
+UWSGI_OPTS="-b 65535 --socket /tmp/uwsgi.sock --uid ckan --gid ckan --http :5000 --master --enable-threads --wsgi-file /srv/app/wsgi.py --module wsgi:application --lazy-apps --gevent 2000 -p 2 -L --gevent-early-monkey-patch --vacuum --harakiri 50 --callable application"
 
 # Run the prerun script to init CKAN and create the default admin user
 python prerun.py || { echo '[CKAN prerun] FAILED. Exiting...' ; exit 1; }

From 349f152036940a06db481a07c6f4cc6a8b7775c9 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Tue, 7 Nov 2023 16:26:25 -0600
Subject: [PATCH 17/27] Set CKANEXT__SPATIAL__SEARCH_BACKEND=solr-bbox in
 docker/.env-ckan.ini

---
 docker/.env-ckan.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/.env-ckan.env b/docker/.env-ckan.env
index b567902..4a14415 100644
--- a/docker/.env-ckan.env
+++ b/docker/.env-ckan.env
@@ -41,7 +41,7 @@ CKAN__AUTH__CREATE_USER_VIA_WEB=false
 CKAN__TRACKING_ENABLED=true
 
 # Spatial Settings
-CKANEXT__SPATIAL__SEARCH_BACKEND=solr
+CKANEXT__SPATIAL__SEARCH_BACKEND=solr-bbox
 
 # CKAN requires storage path to be set in order for filestore to be enabled
 CKAN__STORAGE_PATH=/srv/app/data

From 129bcef051b334de660bc7eb7994af9b0d389869 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Fri, 10 Nov 2023 13:52:20 -0600
Subject: [PATCH 18/27] Miscellaneous updates preparing for prod release 0.5

Changed UWSGI_OPTS buffer setting to '-b 8192'
Updated tags for ckanext-contact
Switched back to prod googleanalytics.id
---
 docker/ckan/Dockerfile                | 2 +-
 docker/ckan/plugins/ckan_plugins.json | 4 ++--
 docker/ckan/setup/app/start_ckan.sh   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index 86271f9..57f03fd 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -260,7 +260,7 @@ RUN ckan config-tool ${APP_DIR}/production.ini "ckan.plugins = ${CKAN__PLUGINS}"
     # change default logo to tx water logo from cdn.tnris.org
     ckan config-tool ${APP_DIR}/production.ini "ckan.site_logo = https://cdn.tnris.org/images/Hub_NavIcon_dark.png" && \
     # add config option for google analytics download view
-    ckan config-tool ${APP_DIR}/production.ini "googleanalytics.id = G-CYTPM5673B" && \
+    ckan config-tool ${APP_DIR}/production.ini "googleanalytics.id = G-SJK5R9G5F5" && \
     ckan config-tool ${APP_DIR}/production.ini "googleanalytics.download_handler = ckanext.s3filestore.views:resource_download" && \
     # Change ownership to app user
     chown -R ckan:ckan /srv/app
diff --git a/docker/ckan/plugins/ckan_plugins.json b/docker/ckan/plugins/ckan_plugins.json
index 65baac4..9c02b94 100644
--- a/docker/ckan/plugins/ckan_plugins.json
+++ b/docker/ckan/plugins/ckan_plugins.json
@@ -67,8 +67,8 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-contact",
-      "tag": "TWDHv0.4.0.rc9",
-      "branch": "main",
+      "tag": "",
+      "branch": "bb-dev",
       "cmd": ["pip install -r requirements.txt", "python setup.py develop"]
     },
     {
diff --git a/docker/ckan/setup/app/start_ckan.sh b/docker/ckan/setup/app/start_ckan.sh
index c246079..55df6cc 100755
--- a/docker/ckan/setup/app/start_ckan.sh
+++ b/docker/ckan/setup/app/start_ckan.sh
@@ -13,7 +13,7 @@ then
 fi
 
 # Set the common uwsgi options
-UWSGI_OPTS="-b 65535 --socket /tmp/uwsgi.sock --uid ckan --gid ckan --http :5000 --master --enable-threads --wsgi-file /srv/app/wsgi.py --module wsgi:application --lazy-apps --gevent 2000 -p 2 -L --gevent-early-monkey-patch --vacuum --harakiri 50 --callable application"
+UWSGI_OPTS="-b 8192 --socket /tmp/uwsgi.sock --uid ckan --gid ckan --http :5000 --master --enable-threads --wsgi-file /srv/app/wsgi.py --module wsgi:application --lazy-apps --gevent 2000 -p 2 -L --gevent-early-monkey-patch --vacuum --harakiri 50 --callable application"
 
 # Run the prerun script to init CKAN and create the default admin user
 python prerun.py || { echo '[CKAN prerun] FAILED. Exiting...' ; exit 1; }

From 5e3d813b21f929c6bbe3c0608d02a56b115d5a02 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Thu, 16 Nov 2023 09:19:04 -0600
Subject: [PATCH 19/27] WIP turned off googleanalytics plugin

Debugging issue with GA conflicting with S3 plugin
---
 docker/ckan/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index 57f03fd..8f44cef 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -146,7 +146,6 @@ ENV CKAN__PLUGINS \
     datatablesview_plus \
     datapusher \
     openapi_viewer \
-    googleanalytics \
     s3filestore \
     ags_fs_view \ 
     twdh_gazetteer \

From 527f61d2d844388c7fe54878083f0f6db4b32ba7 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Thu, 16 Nov 2023 10:04:54 -0600
Subject: [PATCH 20/27] Turned googleanalytics back on

Placed googleanalytics after s3filestore in the plugin list to see if
this has any effect on the get_path() bug
---
 docker/ckan/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index 8f44cef..b29d211 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -147,6 +147,7 @@ ENV CKAN__PLUGINS \
     datapusher \
     openapi_viewer \
     s3filestore \
+    googleanalytics \
     ags_fs_view \ 
     twdh_gazetteer \
     envvars 

From 5e9aac97c50615784e72a265a9d2bd11768f34b3 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Fri, 17 Nov 2023 15:00:42 -0600
Subject: [PATCH 21/27] Removed buffer size modification no longer needed for
 DT ShareSearch implementation

---
 docker/ckan/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index b29d211..7f25b8f 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -152,6 +152,7 @@ ENV CKAN__PLUGINS \
     twdh_gazetteer \
     envvars 
     # ^ envvars always needs to be last in the CKAN__PLUGINS list
+    # s3filestore MUST PRECEDE googlealanalytics in the CKAN_PLUGINS list
 
 # s3filestore env variables
 ENV CKANEXT__S3FILESTORE__AWS_BUCKET_NAME twdh-s3filestore

From 1466289748cf22247cc9eb0c487eea0a05e40e61 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Fri, 17 Nov 2023 15:01:22 -0600
Subject: [PATCH 22/27] Removed buffer size modification no longer needed for
 DT ShareSearch implementation

---
 docker/ckan/setup/app/start_ckan.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/ckan/setup/app/start_ckan.sh b/docker/ckan/setup/app/start_ckan.sh
index 55df6cc..fee6dad 100755
--- a/docker/ckan/setup/app/start_ckan.sh
+++ b/docker/ckan/setup/app/start_ckan.sh
@@ -13,7 +13,7 @@ then
 fi
 
 # Set the common uwsgi options
-UWSGI_OPTS="-b 8192 --socket /tmp/uwsgi.sock --uid ckan --gid ckan --http :5000 --master --enable-threads --wsgi-file /srv/app/wsgi.py --module wsgi:application --lazy-apps --gevent 2000 -p 2 -L --gevent-early-monkey-patch --vacuum --harakiri 50 --callable application"
+UWSGI_OPTS="--socket /tmp/uwsgi.sock --uid ckan --gid ckan --http :5000 --master --enable-threads --wsgi-file /srv/app/wsgi.py --module wsgi:application --lazy-apps --gevent 2000 -p 2 -L --gevent-early-monkey-patch --vacuum --harakiri 50 --callable application"
 
 # Run the prerun script to init CKAN and create the default admin user
 python prerun.py || { echo '[CKAN prerun] FAILED. Exiting...' ; exit 1; }

From e5d380e583a9620de9d25ed79d824aedda37391c Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Fri, 17 Nov 2023 15:00:42 -0600
Subject: [PATCH 23/27] Moved googleanaltics to be after s3filestore in
 ckan.plugins

Having googleanalytics before s3filestore in ckan.plugins list causes an
error related to get_path() parameters
---
 docker/ckan/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index b29d211..7f25b8f 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -152,6 +152,7 @@ ENV CKAN__PLUGINS \
     twdh_gazetteer \
     envvars 
     # ^ envvars always needs to be last in the CKAN__PLUGINS list
+    # s3filestore MUST PRECEDE googlealanalytics in the CKAN_PLUGINS list
 
 # s3filestore env variables
 ENV CKANEXT__S3FILESTORE__AWS_BUCKET_NAME twdh-s3filestore

From eeee27768a8f73b697d6b83aafc6d68f2aba348a Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Fri, 17 Nov 2023 15:01:22 -0600
Subject: [PATCH 24/27] Removed buffer size modification no longer needed for
 DT ShareSearch implementation

---
 docker/ckan/setup/app/start_ckan.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/ckan/setup/app/start_ckan.sh b/docker/ckan/setup/app/start_ckan.sh
index 55df6cc..fee6dad 100755
--- a/docker/ckan/setup/app/start_ckan.sh
+++ b/docker/ckan/setup/app/start_ckan.sh
@@ -13,7 +13,7 @@ then
 fi
 
 # Set the common uwsgi options
-UWSGI_OPTS="-b 8192 --socket /tmp/uwsgi.sock --uid ckan --gid ckan --http :5000 --master --enable-threads --wsgi-file /srv/app/wsgi.py --module wsgi:application --lazy-apps --gevent 2000 -p 2 -L --gevent-early-monkey-patch --vacuum --harakiri 50 --callable application"
+UWSGI_OPTS="--socket /tmp/uwsgi.sock --uid ckan --gid ckan --http :5000 --master --enable-threads --wsgi-file /srv/app/wsgi.py --module wsgi:application --lazy-apps --gevent 2000 -p 2 -L --gevent-early-monkey-patch --vacuum --harakiri 50 --callable application"
 
 # Run the prerun script to init CKAN and create the default admin user
 python prerun.py || { echo '[CKAN prerun] FAILED. Exiting...' ; exit 1; }

From e1789974ec67c046d3d9db98f5f4fc6d63cd340b Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Fri, 17 Nov 2023 15:08:10 -0600
Subject: [PATCH 25/27] Added DataTables afterinit.d file to execute DT migrate
 command

---
 docker/ckan/afterinit.d/02_datatables.sh | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 docker/ckan/afterinit.d/02_datatables.sh

diff --git a/docker/ckan/afterinit.d/02_datatables.sh b/docker/ckan/afterinit.d/02_datatables.sh
new file mode 100644
index 0000000..d5e9577
--- /dev/null
+++ b/docker/ckan/afterinit.d/02_datatables.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo "@@@@@@ INIT SECURITY @@@@@@"
+ckan -c /srv/app/production.ini datatablesview-plus migrate

From fb7e8d28d93b321ca5e325ca8c5b3519d070e77b Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Fri, 17 Nov 2023 15:28:09 -0600
Subject: [PATCH 26/27] Switched ckanext-datatables_plus to
 bb-dev-shared-search branch

---
 docker/ckan/plugins/ckan_plugins.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/ckan/plugins/ckan_plugins.json b/docker/ckan/plugins/ckan_plugins.json
index 9c02b94..41c80f4 100644
--- a/docker/ckan/plugins/ckan_plugins.json
+++ b/docker/ckan/plugins/ckan_plugins.json
@@ -60,8 +60,8 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-pages",
-      "tag": "TWDHv0.2.6",
-      "branch": "master",
+      "tag": "",
+      "branch": "bb-dev",
       "cmd": ["pip install -e .", "pip install -r requirements.txt"]
     },
     {
@@ -89,7 +89,7 @@
       "owner": "TNRIS",
       "repo": "ckanext-datatablesview_plus",
       "tag": "",
-      "branch": "bb-dev",
+      "branch": "bb-dev-shared-search",
       "cmd": [
         "python setup.py install",
         "pip install botocore==1.27.29",

From 93b380fc7b71a6934d592206f3c39abcbceb10c9 Mon Sep 17 00:00:00 2001
From: Ben Bright <ben.bright@twdb.texas.gov>
Date: Wed, 6 Dec 2023 11:10:41 -0600
Subject: [PATCH 27/27] Updated tags for TWDHv0.5.0.rc1 release

---
 docker/ckan/plugins/ckan_plugins.json | 32 +++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/docker/ckan/plugins/ckan_plugins.json b/docker/ckan/plugins/ckan_plugins.json
index 41c80f4..a6cba99 100644
--- a/docker/ckan/plugins/ckan_plugins.json
+++ b/docker/ckan/plugins/ckan_plugins.json
@@ -3,8 +3,8 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-twdh_theme",
-      "tag": "",
-      "branch": "bb-dev",
+      "tag": "TWDHv0.5.0.rc1",
+      "branch": "",
       "cmd": [
         "pip install -e .",
         "pip install -r requirements.txt",
@@ -14,8 +14,8 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-twdh_schema",
-      "tag": "",
-      "branch": "bb-dev",
+      "tag": "TWDHv0.5.0.rc1",
+      "branch": "",
       "cmd": ["pip install -e .", "pip install -r requirements.txt"]
     },
     {
@@ -28,8 +28,8 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-spatial",
-      "tag": "",
-      "branch": "bb-dev",
+      "tag": "TWDHv0.5.0.rc1",
+      "branch": "",
       "cmd": [
         "pip install -e .",
         "pip install -r requirements.txt",
@@ -60,15 +60,15 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-pages",
-      "tag": "",
-      "branch": "bb-dev",
+      "tag": "TWDHv0.5.0.rc1",
+      "branch": "",
       "cmd": ["pip install -e .", "pip install -r requirements.txt"]
     },
     {
       "owner": "TNRIS",
       "repo": "ckanext-contact",
-      "tag": "",
-      "branch": "bb-dev",
+      "tag": "TWDHv0.5.0.rc1",
+      "branch": "",
       "cmd": ["pip install -r requirements.txt", "python setup.py develop"]
     },
     {
@@ -88,8 +88,8 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-datatablesview_plus",
-      "tag": "",
-      "branch": "bb-dev-shared-search",
+      "tag": "TWDHv0.5.0.rc1",
+      "branch": "",
       "cmd": [
         "python setup.py install",
         "pip install botocore==1.27.29",
@@ -99,8 +99,8 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-googleanalytics",
-      "tag": "",
-      "branch": "bb-dev",
+      "tag": "TWDHv0.5.0.rc1",
+      "branch": "",
       "cmd": ["python setup.py install", "pip install -r requirements.txt"]
     },
     {
@@ -127,8 +127,8 @@
     {
       "owner": "TNRIS",
       "repo": "ckanext-check-link",
-      "tag": "",
-      "branch": "bb-dev",
+      "tag": "TWDHv0.5.0.rc1",
+      "branch": "",
       "cmd": ["python setup.py install", "pip install -r dev-requirements.txt"]
     },
     {