Merge branch 'master' of github.com:natcap/data.naturalcapitalproject.stanford.edu into bugfix/64-enable-multiclipping

Conflicts:
	src/ckanext-natcap/ckanext/natcap/templates/home/robots.txt

Author: phargogh

.env.example

@@ -1,5 +1,10 @@
+# Stamen script settings
+GITHUB_USER=natcap
+GITHUB_REPO=data.naturalcapitalproject.stanford.edu
+GITHUB_BRANCH=master
+
 # Host Ports
-CKAN_PORT_HOST=5000
+CKAN_PORT_HOST=8443
 NGINX_PORT_HOST=81
 NGINX_SSLPORT_HOST=8443
 
@@ -35,8 +40,7 @@ CKAN_VERSION=2.10.0
 CKAN_SITE_ID=default
 CKAN_SITE_URL=https://localhost:8443
 #CKAN_SITE_URL=https://data.naturalcapitalproject.stanford.edu:8443  # used for prod docker-compose cluster
-CKAN_PORT=5000
-CKAN_PORT_HOST=5000
+CKAN_PORT=8443
 CKAN__CACHE_EXPIRES=300  # expire cache after 5min
 CKAN__CACHE_ENABLED=True
 CKAN___BEAKER__SESSION__SECRET=CHANGE_ME
@@ -53,7 +57,7 @@ CKAN_SMTP_USER=user
 CKAN_SMTP_PASSWORD=pass
 CKAN_SMTP_MAIL_FROM=ckan@localhost
 TZ=UTC
-CKAN___LICENSES_GROUP_URL=file:///usr/lib/python3.10/site-packages/ckanext/natcap/public/opendefinition-org-all-licenses.json
+CKAN___LICENSES_GROUP_URL=file:///srv/app/src/ckanext-natcap/ckanext/natcap/public/opendefinition-org-all-licenses.json
 
 # Solr
 SOLR_IMAGE_VERSION=2.10-solr9
@@ -68,16 +72,17 @@ TEST_CKAN_REDIS_URL=redis://redis:6379/1
 # Datapusher
 DATAPUSHER_VERSION=0.0.20
 CKAN_DATAPUSHER_URL=http://datapusher:8800
-CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000
+CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:8443
 DATAPUSHER_REWRITE_RESOURCES=True
-DATAPUSHER_REWRITE_URL=http://ckan:5000
+DATAPUSHER_REWRITE_URL=http://ckan:8443
 
 # NGINX
 NGINX_PORT=80
 NGINX_SSLPORT=443
 
 # Extensions
-CKAN__PLUGINS="googleanalytics envvars natcap tracking or_facet image_view text_view datatables_view recline_view datastore datapusher spatial_metadata spatial_query stats activity scheming_datasets"
+# NOTE: PLUGIN ORDER MATTERS!  BE CAREFUL
+CKAN__PLUGINS="or_facet googleanalytics envvars natcap tracking image_view text_view datatables_view datastore datapusher mappreview spatial_metadata spatial_query stats activity zipexpand sitemap"
 CKAN__HARVEST__MQ__TYPE=redis
 CKAN__HARVEST__MQ__HOSTNAME=redis
 CKAN__HARVEST__MQ__PORT=6379
@@ -108,14 +113,15 @@ CKAN__AUTH__CREATE_USER_VIA_WEB=false
 # Anon users cannot view user details
 CKAN__AUTH__PUBLIC_USER_DETAILS=false
 
-# Add ckanext.scheming schemas here
-CKAN___SCHEMING__DATASET_SCHEMAS="ckanext.natcap:natcap_dataset_schema.yml"
-
 # Config for or_facet, allow OR logic for facets
 CKANEXT__OR_FACET__OPTIONAL="extras_sources_res_formats extras_placenames tags"
 
-CKAN___GOOGLEANALYTICS__ID=""  # The tracking id, could be from GA4
-CKAN___GOOGLEANALYTICS__ACCOUNT=""  # our GA account name, from the upper-right of the GA panel
+CKANEXT__MAPPREVIEW__MAPBOX_API_KEY="FIXME"
+CKANEXT__MAPPREVIEW__MAPBOX_STYLE="mapbox://styles/FIXME"
+CKANEXT__MAPPREVIEW__TITILER_URL="https://titiler-897938321824.us-west1.run.app"
+
+CKAN___GOOGLEANALYTICS__ID="G-3EBTM23KV6"  # The tracking id, could be from GA4.  Google says this is not a secret.
+CKAN___GOOGLEANALYTICS__ACCOUNT="data.naturalcapitalproject.stanford.edu"  # our GA account name, from the upper-right of the GA panel
 #CKANEXT__GOOGLEANALYTICS_USERNAME=""  # README says this is required, but I'm not seeing it in the source code and I don't want to provide it.  Doesn't appear to be needed.
 #CKANEXT__GOOGLEANALYTICS_PASSWORD=""  # README says this is required, but I'm not seeing it in the source code and I don't want to provide it.  Doesn't appear to be needed.
 

.gitignore

@@ -12,3 +12,4 @@ local/*
 env310
 *~
 venv
+node_modules

Makefile

@@ -1,18 +1,26 @@
-.PHONY: deploy deploy-staging sync-on-prod
+.PHONY: deploy deploy-staging sync-on-prod fetch-nginx-config
 
 GIT_DIR := /opt/ckan-catalog/data.naturalcapitalproject.stanford.edu
 CKAN_PROD_URL := https://data.naturalcapitalproject.stanford.edu
+GCLOUD_COMMON_ARGS := --project=sdss-natcap-gef-ckan --zone=us-central1-a
+RESTART_DOCKER_CMD := sudo sh -c 'cd $(GIT_DIR) && git pull && docker compose build && docker compose down && docker compose up --detach --remove-orphans'
+PROD_VM_NAME := ckan-2
+STAGING_VM_NAME := ckan-staging
 
 # Building happens first, while the cluster is still up, because it can take a while.
 # This way we minimize catalog downtime.
 deploy:
 	git log origin/master..HEAD > /dev/null || (echo "There are unpushed commits.  git push and re-run."; exit 1)
-	gcloud compute ssh --zone "us-central1-a" "ckan-1" --project "sdss-natcap-gef-ckan" \
-		--command="sudo sh -c 'cd $(GIT_DIR) && git pull && docker compose build && docker compose down && docker compose up --detach --remove-orphans'"
+	gcloud compute ssh $(GCLOUD_COMMON_ARGS) $(PROD_VM_NAME) --command="$(RESTART_DOCKER_CMD)"
 
 deploy-staging:
-	gcloud compute ssh --zone "us-central1-a" "ckan-staging" --project "sdss-natcap-gef-ckan" \
-		--command="sudo sh -c 'cd $(GIT_DIR) && git pull && docker compose build && docker compose down && docker compose up --detach --remove-orphans'"
+	gcloud compute ssh $(GCLOUD_COMMON_ARGS) $(STAGING_VM_NAME) --command="$(RESTART_DOCKER_CMD)"
 
 sync-on-prod:
 	SYNC_SRC_URL=$(CKAN_PROD_URL) SYNC_DST_URL=$(CKAN_PROD_URL) python api-scripts/sync-datasets.py
+
+fetch-nginx-config:
+	gcloud compute scp $(GCLOUD_COMMON_ARGS) $(PROD_VM_NAME):/etc/nginx/ckan-proxy.conf     host-nginx/etc.nginx.ckan-proxy.conf
+	gcloud compute scp $(GCLOUD_COMMON_ARGS) $(PROD_VM_NAME):/etc/nginx/sites-enabled/ckan  host-nginx/etc.nginx.sites-available.ckan
+	gcloud compute scp $(GCLOUD_COMMON_ARGS) $(PROD_VM_NAME):/etc/nginx/nginx.conf          host-nginx/etc.nginx.nginx.conf
+	gcloud compute scp $(GCLOUD_COMMON_ARGS) $(PROD_VM_NAME):/etc/nginx/throttle-bots.conf  host-nginx/etc.nginx.throttle-bots.conf

analytics/bucket-analytics/.gitignore

@@ -0,0 +1 @@
+env313