From 2f92ccb85e91876a854250d64dd27e1f5f4e249e Mon Sep 17 00:00:00 2001 From: Kyle Huynh Date: Thu, 6 Jul 2023 02:32:37 -0400 Subject: [PATCH 1/3] Add steps to create private file directory Enable Delegate script for Cantaloupe --- Makefile | 6 ++++-- sample.env | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8f09b22b3..e9c4d66fb 100644 --- a/Makefile +++ b/Makefile @@ -160,7 +160,8 @@ local: generate-secrets curl -k -u admin:'$(shell cat secrets/live/DRUPAL_DEFAULT_ACCOUNT_PASSWORD)' -H "Content-Type: application/json" -d "@build/demo-data/homepage.json" https://${DOMAIN}/node?_format=json curl -k -u admin:'$(shell cat secrets/live/DRUPAL_DEFAULT_ACCOUNT_PASSWORD)' -H "Content-Type: application/json" -d "@build/demo-data/browse-collections.json" https://${DOMAIN}/node?_format=json $(MAKE) login - + # make private file directory + docker-compose exec -T drupal mkdir -p $(CURDIR)/codebase/web/sites/default/private_files .PHONY: starter ## Make a local site with codebase directory bind mounted, using starter site unless other package specified in .env or present already. @@ -183,7 +184,7 @@ starter_dev: QUOTED_CURDIR = "$(CURDIR)" starter_dev: generate-secrets $(MAKE) starter-init ENVIRONMENT=starter_dev if [ -z "$$(ls -A $(QUOTED_CURDIR)/codebase)" ]; then \ - docker container run --rm -v $(CURDIR)/codebase:/home/root $(REPOSITORY)/nginx:$(TAG) with-contenv bash -lc 'git clone -b main https://github.com/Islandora-Devops/islandora-starter-site /home/root;'; \ + docker container run --rm -v $(CURDIR)/codebase:/home/root $(REPOSITORY)/nginx:$(TAG) with-contenv bash -lc 'git clone -b islandora_group https://github.com/kylehuynh205/islandora-starter-site.git /home/root;'; \ fi $(MAKE) set-files-owner SRC=$(CURDIR)/codebase ENVIRONMENT=starter_dev docker compose up -d --remove-orphans @@ -200,6 +201,7 @@ production: generate-secrets docker compose exec -T drupal with-contenv bash -lc 'composer install; chown -R nginx:nginx .' docker compose exec -T drupal with-contenv bash -lc "drush si -y --existing-config minimal --account-pass '$(shell cat secrets/live/DRUPAL_DEFAULT_ACCOUNT_PASSWORD)'" docker compose exec -T drupal with-contenv bash -lc "drush -l $(SITE) user:role:add fedoraadmin admin" + docker-compose exec -T drupal with-contenv bash -lc "drush -l $(SITE) user:role:add administrator admin" MIGRATE_IMPORT_USER_OPTION=--userid=1 $(MAKE) hydrate docker compose exec -T drupal with-contenv bash -lc 'drush -l $(SITE) migrate:import --userid=1 islandora_fits_tags' $(MAKE) login diff --git a/sample.env b/sample.env index aec02bcdd..65d4daf75 100644 --- a/sample.env +++ b/sample.env @@ -194,6 +194,6 @@ TRAEFIK_MEMORY_LIMIT=8G WATCHTOWER_MEMORY_LIMIT=2G # Configuration to enable the custom delegate script for Cantaloupe -CANTALOUPE_DELEGATE_SCRIPT_ENABLED=false +CANTALOUPE_DELEGATE_SCRIPT_ENABLED=true CANTALOUPE_DELEGATE_SCRIPT_PATHNAME=/opt/tomcat/bin/delegates.rb -CANTALOUPE_HTTPSOURCE_LOOKUP_STRATEGY=BasicLookupStrategy +CANTALOUPE_HTTPSOURCE_LOOKUP_STRATEGY=ScriptLookupStrategy From 38e437af39547fd47d91bd92445ab23f63c210ed Mon Sep 17 00:00:00 2001 From: Kyle Huynh Date: Thu, 13 Jul 2023 12:53:01 -0400 Subject: [PATCH 2/3] Removed because it's not nescessary --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index e9c4d66fb..b8eee2141 100644 --- a/Makefile +++ b/Makefile @@ -160,8 +160,6 @@ local: generate-secrets curl -k -u admin:'$(shell cat secrets/live/DRUPAL_DEFAULT_ACCOUNT_PASSWORD)' -H "Content-Type: application/json" -d "@build/demo-data/homepage.json" https://${DOMAIN}/node?_format=json curl -k -u admin:'$(shell cat secrets/live/DRUPAL_DEFAULT_ACCOUNT_PASSWORD)' -H "Content-Type: application/json" -d "@build/demo-data/browse-collections.json" https://${DOMAIN}/node?_format=json $(MAKE) login - # make private file directory - docker-compose exec -T drupal mkdir -p $(CURDIR)/codebase/web/sites/default/private_files .PHONY: starter ## Make a local site with codebase directory bind mounted, using starter site unless other package specified in .env or present already. From 25121da7dfdc12076e51a270be2084a0bbd920e5 Mon Sep 17 00:00:00 2001 From: Kyle Huynh <7862086+kylehuynh205@users.noreply.github.com> Date: Thu, 13 Jul 2023 13:07:08 -0400 Subject: [PATCH 3/3] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b8eee2141..e0bc82d74 100644 --- a/Makefile +++ b/Makefile @@ -182,7 +182,7 @@ starter_dev: QUOTED_CURDIR = "$(CURDIR)" starter_dev: generate-secrets $(MAKE) starter-init ENVIRONMENT=starter_dev if [ -z "$$(ls -A $(QUOTED_CURDIR)/codebase)" ]; then \ - docker container run --rm -v $(CURDIR)/codebase:/home/root $(REPOSITORY)/nginx:$(TAG) with-contenv bash -lc 'git clone -b islandora_group https://github.com/kylehuynh205/islandora-starter-site.git /home/root;'; \ + docker container run --rm -v $(CURDIR)/codebase:/home/root $(REPOSITORY)/nginx:$(TAG) with-contenv bash -lc 'git clone -b main https://github.com/Islandora-Devops/islandora-starter-site.git /home/root;'; \ fi $(MAKE) set-files-owner SRC=$(CURDIR)/codebase ENVIRONMENT=starter_dev docker compose up -d --remove-orphans